Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

java build passing on windows

  • Loading branch information...
commit 4bd45339672e32f68d947d46d108a2eadbec73cb 1 parent ba6b6d4
@slagyr authored
View
2  ruby/Rakefile 100644 → 100755
@@ -1,5 +1,3 @@
-require 'rake/dsl_definition'
-#require 'rake'
load File.expand_path(File.dirname(__FILE__) + "/../etc/tasks/_common.rake")
#require File.expand_path(File.dirname(__FILE__) + "/lib/limelight.jar")
View
1  src/limelight/model/CastingDirector.java 100644 → 100755
@@ -11,7 +11,6 @@
import limelight.ui.model.PropPanel;
import limelight.ui.model.Scene;
import limelight.util.StringUtil;
-import sun.swing.StringUIClientPropertyKey;
public class CastingDirector
{
View
7 test/limelight/io/DownloaderTest.java 100644 → 100755
@@ -15,20 +15,17 @@
public class DownloaderTest
{
private static final String dataRoot = "/limelight/data";
- private static final String downloadRoot = Context.fs().join(dataRoot, "Downloads");
+ private static final String downloadRoot = dataRoot + "/Downloads";
private Downloader downloader;
private FakeFileSystem fs;
- private MockOS os;
@Before
public void setUp() throws Exception
{
Data.reset();
- os = new MockOS();
- os.dataRoot = dataRoot;
- Context.instance().os = os;
+ MockOS.installed().dataRoot = dataRoot;
fs = FakeFileSystem.installed();
downloader = new Downloader();
View
10 test/limelight/os/MockOS.java 100644 → 100755
@@ -3,11 +3,20 @@
package limelight.os;
+import limelight.Context;
+
public class MockOS extends OS
{
public boolean systemPropertiesConfigured;
public String dataRoot;
+ public static MockOS installed()
+ {
+ final MockOS os = new MockOS();
+ Context.instance().os = os;
+ return os;
+ }
+
protected void turnOnKioskMode()
{
}
@@ -33,4 +42,5 @@ public String dataRoot()
else
return super.dataRoot();
}
+
}
Please sign in to comment.
Something went wrong with that request. Please try again.