Skip to content
Browse files

Changed filename

  • Loading branch information...
1 parent 88be487 commit ba6e80eb1d7a2e6326cf81a1ed190bb50b8e08d9 @banshee committed Feb 23, 2012
View
1 src/main/java/com/restphone/androidproguardscala/AndroidProguardScalaNature.java
@@ -5,6 +5,7 @@
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IProjectNature;
import org.eclipse.core.runtime.CoreException;
+import com.restphone.androidproguardscala.AndroidProguardScalaBuilder;
public class AndroidProguardScalaNature implements IProjectNature {
public static final String NATURE_ID = "com.restphone.androidproguardscala.Nature";
View
18 ...roguardscala/EclipseProguardBuilder.scala → ...rdscala/AndroidProguardScalaBuilder.scala
@@ -21,6 +21,7 @@ import org.objectweb.asm.Type
import org.osgi.framework.BundleContext
import proguard.Initializer
+import scala.util.control.Exception._
class AndroidProguardScalaBuilder extends IncrementalProjectBuilder {
import RichPath._
@@ -100,7 +101,9 @@ class AndroidProguardScalaBuilder extends IncrementalProjectBuilder {
proguardDefaults = proguardDefaults,
logger = logger)
- executeSequenceOfProguardEvents(params)
+ ((rubyCacheController.build_proguard_dependency_files _) andThen
+ rubyCacheController.run_proguard andThen
+ rubyCacheController.install_proguard_output)(params)
val classpathEntryForMinifedLibrary = processedClasspathEntries find { case (_, libraryName) => isMinifiedLibraryName(libraryName) }
if (classpathEntryForMinifedLibrary.isEmpty) {
@@ -116,10 +119,6 @@ class AndroidProguardScalaBuilder extends IncrementalProjectBuilder {
Array.empty
}
- val executeSequenceOfProguardEvents = ((rubyCacheController.build_proguard_dependency_files _) andThen
- rubyCacheController.run_proguard andThen
- rubyCacheController.install_proguard_output)
-
def tellEclipsePathNeedsToBeRefreshed(p: IPath) = {
getProject.getFile(p).refreshLocal(IResource.DEPTH_INFINITE, null)
}
@@ -218,15 +217,6 @@ class Activator extends org.eclipse.ui.plugin.AbstractUIPlugin {
}
}
-object NotNull {
- def apply[T](x: T, msg: String = "must not be null"): Option[T] = {
- val result = Option(x)
-
- if (result.isDefined) result
- else throw new RuntimeException(msg)
- }
-}
-
class RichFile(f: File) {
def /(that: String) = new File(f, that)
}

0 comments on commit ba6e80e

Please sign in to comment.
Something went wrong with that request. Please try again.