Remove deprecated types, mark unused code deprecated

dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java

@@ -17,7 +17,6 @@
 package com.google.gwt.dev.codeserver;
 
 import com.google.gwt.core.ext.TreeLogger;
-import com.google.gwt.dev.cfg.Properties;
 import com.google.gwt.dev.jjs.JsOutputOption;
 import com.google.gwt.dev.js.JsNamespaceOption;
 import com.google.gwt.dev.util.arg.OptionMethodNameDisplayMode;
@@ -79,21 +78,11 @@ public File getExtraDir() {
     return compileDir.getExtraDir();
   }
 
-  @Override
-  public Properties getFinalProperties() {
-    return null; // handling this in a different way
-  }
-
   @Override
   public int getFragmentCount() {
     return -1;
   }
 
-  @Override
-  public int getFragmentsMerge() {
-    return -1;
-  }
-
   @Override
   public File getGenDir() {
     return compileDir.getGenDir();

dev/codeserver/java/com/google/gwt/dev/codeserver/Job.java

@@ -64,7 +64,6 @@ class Job {
   // Listeners
 
   private final Outbox outbox;
-  private final RecompileListener recompileListener;
   private final JobChangeListener jobChangeListener;
   private final LogSupplier logSupplier;
 
@@ -100,7 +99,6 @@ class Job {
     // TODO: we will use the binding properties to find or create the outbox,
     // then take binding properties from the outbox here.
     this.bindingProperties = ImmutableSortedMap.copyOf(bindingProperties);
-    this.recompileListener = Preconditions.checkNotNull(options.getRecompileListener());
     this.jobChangeListener = Preconditions.checkNotNull(options.getJobChangeListener());
     this.args = Preconditions.checkNotNull(options.getArgs());
     this.tags = Preconditions.checkNotNull(options.getTags());
@@ -210,13 +208,6 @@ synchronized void onStarted(int compileId, CompileDir compileDir) {
     this.compileId = compileId;
     this.compileDir = compileDir;
 
-    try {
-      recompileListener.startedCompile(inputModuleName, compileId, compileDir);
-    } catch (Exception e) {
-      getLogger().log(TreeLogger.Type.WARN, "recompile listener threw exception", e);
-      listenerFailure = e;
-    }
-
     publish(makeEvent(Status.COMPILING));
   }
 
@@ -248,16 +239,7 @@ synchronized void onFinished(Result newResult) {
       throw new IllegalStateException("compile job is not active: " + id);
     }
 
-    // Report that we finished unless the listener messed up already.
-    if (listenerFailure == null) {
-      try {
-        recompileListener.finishedCompile(inputModuleName, compileId, newResult.isOk());
-      } catch (Exception e) {
-        getLogger().log(TreeLogger.Type.WARN, "recompile listener threw exception", e);
-        listenerFailure = e;
-      }
-    }
-
+    // Report that we finished
     result.set(newResult);
     outputModuleName = newResult.outputModuleName;
     if (newResult.isOk()) {

dev/codeserver/java/com/google/gwt/dev/codeserver/JobChangeListener.java

@@ -17,8 +17,6 @@
 
 /**
  * A callback for receiving events when a GWT compile job changes status.
- *
- * This interface replaces {@link RecompileListener}.
  */
 public interface JobChangeListener {
   void onJobChange(JobEvent event);

dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java

@@ -79,7 +79,6 @@ public class Options {
   private String preferredHost = ArgHandlerBindAddress.DEFAULT_BIND_ADDRESS;
   private int port = 9876;
 
-  private RecompileListener recompileListener = RecompileListener.NONE;
   private JobChangeListener jobChangeListener = JobChangeListener.NONE;
 
   private TreeLogger.Type logLevel = TreeLogger.Type.INFO;
@@ -172,26 +171,9 @@ synchronized Set<String> getTags() {
     return ImmutableSet.copyOf(tags);
   }
 
-  /**
-   * A Java application that embeds Super Dev Mode can use this hook to find out
-   * when compiles start and end.
-   *
-   * @deprecated replaced by {@link #setJobChangeListener}
-   */
-  @Deprecated
-  public void setRecompileListener(RecompileListener listener) {
-    this.recompileListener = listener == null ? RecompileListener.NONE : listener;
-  }
-
-  RecompileListener getRecompileListener() {
-    return recompileListener;
-  }
-
   /**
    * A Java application that embeds Super Dev Mode can use this hook to find out
    * when compile jobs change state.
-   *
-   * <p>Replaces {@link #setRecompileListener}
    */
   public void setJobChangeListener(JobChangeListener listener) {
     this.jobChangeListener = listener == null ? JobChangeListener.NONE : listener;

dev/codeserver/java/com/google/gwt/dev/codeserver/UnmodifiableCompilerOptions.java

@@ -18,7 +18,6 @@
 
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.dev.CompilerOptions;
-import com.google.gwt.dev.cfg.Properties;
 import com.google.gwt.dev.jjs.JsOutputOption;
 import com.google.gwt.dev.js.JsNamespaceOption;
 import com.google.gwt.dev.util.arg.OptionMethodNameDisplayMode;
@@ -84,21 +83,11 @@ public final void setExtraDir(File extraDir) {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public final void setFinalProperties(Properties finalProperties) {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public void setFragmentCount(int numFragments) {
     throw new UnsupportedOperationException();
   }
 
-  @Override
-  public void setFragmentsMerge(int numFragments) {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public final void setGenDir(File dir) {
     throw new UnsupportedOperationException();

dev/core/src/com/google/gwt/core/ext/debug/JsoEval.java

@@ -43,6 +43,7 @@
  *     "gamma");
  * </pre></code>
  */
+@Deprecated
 public class JsoEval {
 
   /* TODO: Error messages generated from JsoEval are reported with mangled

dev/core/src/com/google/gwt/dev/CompileTaskOptions.java

@@ -15,14 +15,12 @@
  */
 package com.google.gwt.dev;
 
-import com.google.gwt.dev.util.arg.OptionFinalProperties;
 import com.google.gwt.dev.util.arg.OptionLogLevel;
 import com.google.gwt.dev.util.arg.OptionModuleName;
 import com.google.gwt.dev.util.arg.OptionWorkDir;
 
 /**
  * A common set of options for all compile tasks.
  */
-public interface CompileTaskOptions extends OptionModuleName, OptionLogLevel, OptionWorkDir,
-    OptionFinalProperties {
+public interface CompileTaskOptions extends OptionModuleName, OptionLogLevel, OptionWorkDir {
 }

dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java

@@ -16,7 +16,6 @@
 package com.google.gwt.dev;
 
 import com.google.gwt.core.ext.TreeLogger.Type;
-import com.google.gwt.dev.cfg.Properties;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -27,7 +26,6 @@
  */
 class CompileTaskOptionsImpl implements CompileTaskOptions {
 
-  private Properties finalProperties;
   private Type logLevel;
   private final List<String> moduleNames = new ArrayList<String>();
   private File workDir;
@@ -44,18 +42,12 @@ public void copyFrom(CompileTaskOptions other) {
     setLogLevel(other.getLogLevel());
     setModuleNames(other.getModuleNames());
     setWorkDir(other.getWorkDir());
-    setFinalProperties(other.getFinalProperties());
   }
 
   public File getCompilerWorkDir(String moduleName) {
     return new File(new File(getWorkDir(), moduleName), "compiler");
   }
 
-  @Override
-  public Properties getFinalProperties() {
-    return finalProperties;
-  }
-
   @Override
   public Type getLogLevel() {
     return logLevel;
@@ -71,11 +63,6 @@ public File getWorkDir() {
     return workDir;
   }
 
-  @Override
-  public void setFinalProperties(Properties finalProperties) {
-    this.finalProperties = finalProperties;
-  }
-
   @Override
   public void setLogLevel(Type logLevel) {
     this.logLevel = logLevel;