Skip to content

Commit

Permalink
builds with xsbt-0.11.2, uses scala-2.9.1, updated libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
Herr Ritschwumm committed Mar 1, 2012
1 parent 147f084 commit 2eb1f5a
Show file tree
Hide file tree
Showing 29 changed files with 243 additions and 317 deletions.
21 changes: 10 additions & 11 deletions build.sbt
View file
Expand Up @@ -2,9 +2,9 @@ name := "commonist"

organization := "de.djini"

version := "0.4.29"
version := "0.4.30"

scalaVersion := "2.9.0-1"
scalaVersion := "2.9.1"

//publishArtifact in (Compile, packageBin) := false

Expand All @@ -13,11 +13,11 @@ publishArtifact in (Compile, packageDoc) := false
publishArtifact in (Compile, packageSrc) := false

libraryDependencies ++= Seq(
"de.djini" %% "scutil" % "0.0.4" % "compile",
"de.djini" %% "scjson" % "0.0.4" % "compile",
"de.djini" %% "scmw" % "0.0.3" % "compile",
"org.apache.httpcomponents" % "httpclient" % "4.1.1" % "compile",
"org.apache.httpcomponents" % "httpmime" % "4.1.1" % "compile",
"de.djini" %% "scutil" % "0.0.5" % "compile",
"de.djini" %% "scjson" % "0.0.5" % "compile",
"de.djini" %% "scmw" % "0.0.4" % "compile",
"org.apache.httpcomponents" % "httpclient" % "4.1.2" % "compile",
"org.apache.httpcomponents" % "httpmime" % "4.1.2" % "compile",
"org.apache.sanselan" % "sanselan" % "0.97-incubator" % "compile"
)

Expand All @@ -43,8 +43,6 @@ scriptstartVmArguments := Seq("-Xmx192m")

seq(WebStartPlugin.allSettings:_*)

webstartMainClass := "commonist.Commonist"

webstartGenConf := GenConf(
dname = "CN=Snake Oil, OU=Hacking Unit, O=FNORD! Inc., L=Bielefeld, ST=33641, C=DE",
validity = 365
Expand All @@ -57,7 +55,8 @@ webstartKeyConf := KeyConf(
keyPass = "0xDEADBEEF"
)

webstartJnlpConf := JnlpConf(
webstartJnlpConf := Seq(JnlpConf(
mainClass = "commonist.Commonist",
fileName = "commonist.jnlp",
codeBase = "http://djini.de/software/commonist/ws/",
title = "The Commonist",
Expand All @@ -69,4 +68,4 @@ webstartJnlpConf := JnlpConf(
allPermissions = true,
j2seVersion = "1.6+",
maxHeapSize = 192
)
))
5 changes: 5 additions & 0 deletions project/plugins.sbt
View file
@@ -0,0 +1,5 @@
addSbtPlugin("de.djini" % "xsbt-webstart" % "0.0.4")

addSbtPlugin("de.djini" % "xsbt-scriptstart" % "0.0.3")

addSbtPlugin("de.djini" % "xsbt-reflect" % "0.0.3")
5 changes: 0 additions & 5 deletions project/plugins/build.sbt
View file

This file was deleted.

5 changes: 5 additions & 0 deletions src/main/doc/changes.txt
View file
@@ -1,3 +1,8 @@
0.4.30 01mar12
change builds with xsbt-0.11.2 now
change uses scala-2.9.1
change code cleanups

0.4.29 12sep11
change scmw uses apache httpclient 4 now

Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/image_wikimedia_commons.bpp
View file
Expand Up @@ -22,7 +22,9 @@ $(upload.description)
# else if (!upload.coordinates.equals("")) {
$(upload.coordinates)
# }
# if (!common.licenseTemplate.equals("")) {
== {{int:license}} ==
$(common.licenseTemplate)
# }
$(common.categories)
$(upload.categories)
41 changes: 11 additions & 30 deletions src/main/scala/commonist/Commonist.scala
View file
@@ -1,50 +1,31 @@
package commonist

import java.awt.Image
import java.io.File
import java.io.IOException
import java.io.InputStreamReader
import java.io.Reader
import java.net.MalformedURLException
import java.net.URL
import java.awt.{ List => AwtList, _ }
import java.io._
import java.net._

import bsh.Interpreter
import bsh.EvalError

import scutil.Concurrent
import scutil.Implicits._
import scutil.ThreadUtil
import scutil.Files._
import scutil.Resource._
import scutil.AppleQuit
import scutil.log.Logging
import scutil.gui.SwingUtil._
import scutil.ext.AnyRefImplicits._
import scutil.ext.OptionImplicits._
import scutil.ext.FileImplicits._

import commonist.data.LicenseData
import commonist.data.WikiData
import commonist.task.ChangeDirectoryTask
import commonist.task.UploadFilesTask
import commonist.thumb.FileCache
import commonist.thumb.Thumbnails
import commonist.ui.CommonUI
import commonist.ui.DirectoryUI
import commonist.ui.DirectoryUICallback
import commonist.ui.ImageListUI
import commonist.ui.MainWindow
import commonist.ui.MainWindowCallback
import commonist.ui.StatusUI
import commonist.ui.UploadUI
import commonist.ui.UploadUICallback
import commonist.util.Loader
import commonist.util.Settings
import commonist.util.Messages
import commonist.data._
import commonist.task._
import commonist.thumb._
import commonist.ui._
import commonist.util._

/** the main application class */
object Commonist extends App with Logging {
/** main entry point */
override def main(args:Array[String]) {
Concurrent installDefaultUncaughtExceptionHandler { (t,e) =>
ThreadUtil installDefaultUncaughtExceptionHandler { (t,e) =>
ERROR("Exception caught in thread: " + t.getName, e)
}
edt {
Expand Down
16 changes: 6 additions & 10 deletions src/main/scala/commonist/Parser.scala
View file
@@ -1,20 +1,16 @@
package commonist

import java.io.BufferedReader
import java.io.IOException
import java.net.URL
import java.util.regex.Matcher
import java.util.regex.Pattern
import java.io._
import java.net._
import java.util.regex._

import scutil.Implicits._
import scutil.Resource._
import scutil.log.Logging
import scutil.ext.StringImplicits._
import scutil.ext.BooleanImplicits._

import scmw._

import commonist.data.WikiData
import commonist.data.LicenseData
import commonist.data._

object Parser extends Logging {
def parseCategories(s:String):String = {
Expand All @@ -37,7 +33,7 @@ object Parser extends Logging {

def parseCoordinates(s:String):Option[Pair[String,String]] =
s splitAround ',' map { parseCoordinate _ } match {
case List(Some(latitude), Some(longitude)) =>
case Seq(Some(latitude), Some(longitude)) =>
Some(Pair(latitude, longitude))
case _ =>
WARN("could not parse coordinates", s)
Expand Down
13 changes: 5 additions & 8 deletions src/main/scala/commonist/task/ChangeDirectoryTask.scala
View file
Expand Up @@ -3,15 +3,12 @@ package commonist.task
import java.io.File
import javax.swing.Icon

import scutil.Implicits._
import scutil.log.Logging
import scutil.ext.FileImplicits._

import commonist.Constants
import commonist.Task
import commonist.thumb.Thumbnails
import commonist.ui.ImageListUI
import commonist.ui.MainWindow
import commonist.ui.StatusUI
import commonist._
import commonist.thumb._
import commonist.ui._
import commonist.ui.later._

/** change the directory displayed in the ImageListUI */
Expand All @@ -32,7 +29,7 @@ final class ChangeDirectoryTask(mainWindow:MainWindow, imageListUI:ImageListUI,
.getOrElse { WARN("directory does not exist: " + directory); return }

// TODO duplicate code
val sorted = listed.toList sortWith { (a,b) => a.getPath < b.getPath }
val sorted = listed.toList sortBy { _.getPath }

val (readable,unreadable) = sorted partition { _.canRead }
unreadable foreach { it => WARN("cannot read: " + it) }
Expand Down
19 changes: 6 additions & 13 deletions src/main/scala/commonist/task/UploadFilesTask.scala
View file
Expand Up @@ -2,28 +2,21 @@ package commonist.task

import java.io.File
import java.nio.charset.Charset

import javax.swing.JOptionPane

import scutil.Implicits._
import scutil.Charsets
import scutil.log.Logging
import scutil.gui.SwingUtil._
import scutil.ext.FileImplicits._

import scmw._

import commonist.Task
import commonist.Parser
import commonist.Constants
import commonist._
import commonist.data._
import commonist.task.upload._
import commonist.ui.MainWindow
import commonist.ui.ImageListUI
import commonist.ui.StatusUI
import commonist.ui._
import commonist.ui.later._
import commonist.util.Loader
import commonist.util.Messages
import commonist.util.TextUtil2
import commonist.util._

/** upload files selected in the ImageListUI */
final class UploadFilesTask(
Expand Down Expand Up @@ -136,8 +129,8 @@ final class UploadFilesTask(
val next = titleAt(index+1)
val coords = imageData.coordinates
val coordParts = Parser parseCoordinates imageData.coordinates
val latitude = coordParts map { _._1 } getOrElse null
val longitude = coordParts map { _._2 } getOrElse null
val latitude = coordParts map { _._1 } orNull;
val longitude = coordParts map { _._2 } orNull;
val categories = Parser parseCategories imageData.categories

val upload = Upload(
Expand Down
17 changes: 5 additions & 12 deletions src/main/scala/commonist/task/upload/UploadTemplates.scala
View file
@@ -1,30 +1,23 @@
package commonist.task.upload

import java.io.InputStreamReader
import java.io.PrintWriter
import java.io.Reader
import java.io.StringReader
import java.io.StringWriter
import java.net.URL
import java.io._
import java.net._

import net.psammead.minibpp.Compiler
import bsh.Interpreter

import scutil.Implicits._
import scutil.Resource._
import scutil.log.Logging
import scutil.ext.Function1Implicits._
import scutil.ext.OptionImplicits._
import scutil.ext.BooleanImplicits._

import commonist.data._
import commonist.util.Loader
import commonist.util.TextUtil2
import commonist.util._

/** compiles image metadata into a [[Template:Information]] for commons or something similar for other wikis */
final class UploadTemplates(loader:Loader, wiki:WikiData) extends Logging {
/** edit summary for writing a gallery */
def gallerySummary(version:String, failureCount:Int):String =
"commonist " + version + ((failureCount != 0) fold (", " + failureCount + " errors", ""))
"commonist " + version + ((failureCount != 0) cata (", " + failureCount + " errors", ""))

/** compiles into wikitext */
def galleryDescription(common:Common, batch:Batch):String =
Expand Down
11 changes: 2 additions & 9 deletions src/main/scala/commonist/thumb/FileCache.scala
View file
@@ -1,17 +1,10 @@
package commonist.thumb

import java.io.BufferedReader
import java.io.File
import java.io.FileInputStream
import java.io.FileOutputStream
import java.io.IOException
import java.io.InputStreamReader
import java.io.OutputStreamWriter
import java.io.Writer
import java.io._

import scutil.Implicits._
import scutil.Resource._
import scutil.log.Logging
import scutil.ext.FileImplicits._

/** caches drived Files indexed by their original Files */
final class FileCache(list:File, directory:File, cachedFiles:Int) extends Logging {
Expand Down
21 changes: 6 additions & 15 deletions src/main/scala/commonist/thumb/Thumbnails.scala
View file
@@ -1,20 +1,11 @@
package commonist.thumb

import java.awt.Dimension
import java.awt.Graphics
import java.awt.Image
import java.awt.geom.AffineTransform
import java.awt.image.AffineTransformOp
import java.awt.image.BufferedImage
import java.io.File
import java.io.IOException

import javax.imageio.ImageIO
import javax.imageio.ImageReadParam
import javax.imageio.ImageReader
import javax.imageio.stream.ImageInputStream
import javax.swing.Icon
import javax.swing.ImageIcon
import java.io._
import java.awt.{ List => AwtList, _ }
import java.awt.geom._
import java.awt.image._
import javax.swing._
import javax.imageio._

import commonist.Constants
import commonist.util.Settings
Expand Down

0 comments on commit 2eb1f5a

Please sign in to comment.