From 69d8c56a36630980f573fb56154af699bac77036 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Wed, 30 Apr 2025 13:40:41 -0500 Subject: [PATCH 1/4] Remove deprecated classes for GWT 2.13 --- .../dev/codeserver/CompilerOptionsImpl.java | 11 -- .../com/google/gwt/dev/codeserver/Job.java | 20 +-- .../gwt/dev/codeserver/JobChangeListener.java | 2 - .../google/gwt/dev/codeserver/Options.java | 18 -- .../gwt/dev/codeserver/RecompileListener.java | 59 ------- .../UnmodifiableCompilerOptions.java | 11 -- .../google/gwt/dev/ApplicationCreator.java | 30 ---- .../google/gwt/dev/CompileTaskOptions.java | 4 +- .../gwt/dev/CompileTaskOptionsImpl.java | 13 -- .../com/google/gwt/dev/GetJreEmulation.java | 96 ---------- .../gwt/dev/PrecompileTaskArgProcessor.java | 4 - .../gwt/dev/PrecompileTaskOptionsImpl.java | 10 -- .../src/com/google/gwt/dev/RunWebApp.java | 164 ------------------ .../com/google/gwt/dev/SignatureDumper.java | 143 --------------- .../com/google/gwt/dev/jjs/JJSOptions.java | 5 +- .../google/gwt/dev/jjs/JJSOptionsImpl.java | 10 -- .../com/google/gwt/dev/shell/WorkDirs.java | 37 ---- .../shell/log/ServletContextTreeLogger.java | 56 ------ .../util/arg/ArgHandlerDumpSignatures.java | 54 ------ .../dev/util/arg/ArgHandlerFragmentMerge.java | 28 --- .../gwt/dev/util/arg/ArgHandlerOutDir.java | 53 ------ .../dev/util/arg/OptionFinalProperties.java | 34 ---- .../dev/util/arg/OptionFragmentsMerge.java | 39 ----- .../gwt/util/PreventSpuriousRebuilds.java | 33 ---- 24 files changed, 4 insertions(+), 930 deletions(-) delete mode 100644 dev/codeserver/java/com/google/gwt/dev/codeserver/RecompileListener.java delete mode 100644 dev/core/src/com/google/gwt/dev/ApplicationCreator.java delete mode 100644 dev/core/src/com/google/gwt/dev/GetJreEmulation.java delete mode 100644 dev/core/src/com/google/gwt/dev/RunWebApp.java delete mode 100644 dev/core/src/com/google/gwt/dev/SignatureDumper.java delete mode 100644 dev/core/src/com/google/gwt/dev/shell/WorkDirs.java delete mode 100644 dev/core/src/com/google/gwt/dev/shell/log/ServletContextTreeLogger.java delete mode 100644 dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerDumpSignatures.java delete mode 100644 dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerFragmentMerge.java delete mode 100644 dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerOutDir.java delete mode 100644 dev/core/src/com/google/gwt/dev/util/arg/OptionFinalProperties.java delete mode 100644 dev/core/src/com/google/gwt/dev/util/arg/OptionFragmentsMerge.java delete mode 100644 dev/core/src/com/google/gwt/util/PreventSpuriousRebuilds.java diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java index 6f49676f70f..ccfb92f7c69 100644 --- a/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java +++ b/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(); diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Job.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Job.java index 8272d351d69..692473370cd 100644 --- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Job.java +++ b/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()) { diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/JobChangeListener.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/JobChangeListener.java index 7ad8f03ca4a..6372545774b 100644 --- a/dev/codeserver/java/com/google/gwt/dev/codeserver/JobChangeListener.java +++ b/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); diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java index 5440ff0148c..dfb8b401df1 100644 --- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java +++ b/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 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. - * - *

Replaces {@link #setRecompileListener} */ public void setJobChangeListener(JobChangeListener listener) { this.jobChangeListener = listener == null ? JobChangeListener.NONE : listener; diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/RecompileListener.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/RecompileListener.java deleted file mode 100644 index e0670fccfb7..00000000000 --- a/dev/codeserver/java/com/google/gwt/dev/codeserver/RecompileListener.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2013 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.gwt.dev.codeserver; - -/** - * A callback interface that can be used to find out when Super Dev Mode starts and - * finishes its compiles. - * - * @deprecated replaced by {@link JobChangeListener}. - */ -@Deprecated -public interface RecompileListener { - - /** - * Called when starting a compile. - * @param moduleName The name of the module being compiled, before renaming. - * @param compileId An id for this compile, starting from 1 for the first compile. - * The combination of (moduleName, compileId) is unique within - * a Code Server process. After the CodeServer is restarted, starts again from 1. - * @param compileDir The directory used for this compile. Contains subdirectories for - * working files and compiler output. - */ - void startedCompile(String moduleName, int compileId, CompileDir compileDir); - - /** - * Called when a compile finishes. - * @param moduleName The same name passed to startedCompile - * @param compileId The same id passed to startedCompile - * @param success True if the compile succeeded. - */ - void finishedCompile(String moduleName, int compileId, boolean success); - - /** - * A listener that does nothing. - */ - RecompileListener NONE = new RecompileListener() { - @Override - public void startedCompile(String moduleName, int compileId, CompileDir compileDir) { - } - - @Override - public void finishedCompile(String moduleName, int compileId, boolean success) { - } - }; - -} diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/UnmodifiableCompilerOptions.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/UnmodifiableCompilerOptions.java index 1da7efb4d86..f741db67319 100644 --- a/dev/codeserver/java/com/google/gwt/dev/codeserver/UnmodifiableCompilerOptions.java +++ b/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(); diff --git a/dev/core/src/com/google/gwt/dev/ApplicationCreator.java b/dev/core/src/com/google/gwt/dev/ApplicationCreator.java deleted file mode 100644 index 65b7b1480b5..00000000000 --- a/dev/core/src/com/google/gwt/dev/ApplicationCreator.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2008 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.gwt.dev; - -/** - * Legacy ApplicationCreator that will let users know where the new class can be - * found. - */ -public final class ApplicationCreator { - - public static void main(String[] args) { - System.err.println("This application has moved!"); - System.err.println("Please run com.google.gwt.user.tools.ApplicationCreator in gwt-user.jar"); - System.exit(1); - } - -} diff --git a/dev/core/src/com/google/gwt/dev/CompileTaskOptions.java b/dev/core/src/com/google/gwt/dev/CompileTaskOptions.java index 519f0b59ed0..b82e844d422 100644 --- a/dev/core/src/com/google/gwt/dev/CompileTaskOptions.java +++ b/dev/core/src/com/google/gwt/dev/CompileTaskOptions.java @@ -15,7 +15,6 @@ */ 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; @@ -23,6 +22,5 @@ /** * A common set of options for all compile tasks. */ -public interface CompileTaskOptions extends OptionModuleName, OptionLogLevel, OptionWorkDir, - OptionFinalProperties { +public interface CompileTaskOptions extends OptionModuleName, OptionLogLevel, OptionWorkDir { } diff --git a/dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java b/dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java index 9313a76d944..ebcfb5dcb8e 100644 --- a/dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java +++ b/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 moduleNames = new ArrayList(); 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; diff --git a/dev/core/src/com/google/gwt/dev/GetJreEmulation.java b/dev/core/src/com/google/gwt/dev/GetJreEmulation.java deleted file mode 100644 index 5301b9bfab1..00000000000 --- a/dev/core/src/com/google/gwt/dev/GetJreEmulation.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2010 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.gwt.dev; - -import com.google.gwt.core.ext.TreeLogger; -import com.google.gwt.core.ext.UnableToCompleteException; -import com.google.gwt.core.ext.typeinfo.JAbstractMethod; -import com.google.gwt.core.ext.typeinfo.JClassType; -import com.google.gwt.core.ext.typeinfo.JField; -import com.google.gwt.core.ext.typeinfo.TypeOracle; -import com.google.gwt.dev.cfg.ModuleDef; -import com.google.gwt.dev.cfg.ModuleDefLoader; -import com.google.gwt.dev.javac.CompilationState; -import com.google.gwt.dev.util.log.PrintWriterTreeLogger; - -import java.io.PrintWriter; - -/** - * Entry point that outputs the GWT JRE support. - * - * @deprecated This class is deprecated for removal, with no replacement. - */ -@Deprecated -public class GetJreEmulation { - - /** - * Only print the publicly visible API of the JRE. - */ - private static final class FilterImplementation implements - SignatureDumper.Filter { - @Override - public boolean shouldPrint(JAbstractMethod method) { - return method.isPublic() || method.isProtected(); - } - - @Override - public boolean shouldPrint(JClassType type) { - if (type.isMemberType()) { - if (!shouldPrint(type.getEnclosingType())) { - return false; - } - } - return type.getQualifiedSourceName().startsWith("java.") - && (type.isPublic() || type.isProtected()); - } - - @Override - public boolean shouldPrint(JField field) { - return field.isPublic() || field.isProtected(); - } - } - - /** - * @param args unused - */ - public static void main(String[] args) { - try { - PrintWriterTreeLogger logger = new PrintWriterTreeLogger(new PrintWriter( - System.err, true)); - logger.setMaxDetail(TreeLogger.WARN); - logger.log(TreeLogger.Type.WARN, - "GetJreEmulation is deprecated for removal, please consider other options to get " + - "this information from the GWT jar. See https://github.com/gwtproject/gwt/issues/9923 " + - "to discuss other options."); - CompilerContext.Builder compilerContextBuilder = new CompilerContext.Builder(); - CompilerContext compilerContext = compilerContextBuilder.build(); - ModuleDef module = - ModuleDefLoader.loadFromClassPath(logger, "com.google.gwt.core.Core"); - compilerContext = compilerContextBuilder.module(module).build(); - CompilationState compilationState = module.getCompilationState(logger, compilerContext); - TypeOracle typeOracle = compilationState.getTypeOracle(); - SignatureDumper.dumpSignatures(typeOracle, System.out, - new FilterImplementation()); - } catch (UnableToCompleteException e) { - // Error has already been logged. - System.exit(1); - } catch (Throwable e) { - System.err.println("Unexpected error"); - e.printStackTrace(); - System.exit(1); - } - } -} diff --git a/dev/core/src/com/google/gwt/dev/PrecompileTaskArgProcessor.java b/dev/core/src/com/google/gwt/dev/PrecompileTaskArgProcessor.java index 0adbca26221..7d6def8cfae 100644 --- a/dev/core/src/com/google/gwt/dev/PrecompileTaskArgProcessor.java +++ b/dev/core/src/com/google/gwt/dev/PrecompileTaskArgProcessor.java @@ -30,11 +30,9 @@ import com.google.gwt.dev.util.arg.ArgHandlerDisableRunAsync; import com.google.gwt.dev.util.arg.ArgHandlerDisableSoycHtml; import com.google.gwt.dev.util.arg.ArgHandlerDraftCompile; -import com.google.gwt.dev.util.arg.ArgHandlerDumpSignatures; import com.google.gwt.dev.util.arg.ArgHandlerEnableAssertions; import com.google.gwt.dev.util.arg.ArgHandlerFilterJsInteropExports; import com.google.gwt.dev.util.arg.ArgHandlerFragmentCount; -import com.google.gwt.dev.util.arg.ArgHandlerFragmentMerge; import com.google.gwt.dev.util.arg.ArgHandlerGenDir; import com.google.gwt.dev.util.arg.ArgHandlerGenerateJsInteropExports; import com.google.gwt.dev.util.arg.ArgHandlerJsonSoyc; @@ -67,10 +65,8 @@ public PrecompileTaskArgProcessor(PrecompileTaskOptions options) { registerHandler(new ArgHandlerDisableRunAsync(options)); registerHandler(new ArgHandlerDisableSoycHtml(options)); registerHandler(new ArgHandlerDraftCompile(options)); - registerHandler(new ArgHandlerDumpSignatures()); registerHandler(new ArgHandlerEnableAssertions(options)); registerHandler(new ArgHandlerFragmentCount(options)); - registerHandler(new ArgHandlerFragmentMerge()); registerHandler(new ArgHandlerGenDir(options)); registerHandler(new ArgHandlerGenerateJsInteropExports(options)); registerHandler(new ArgHandlerFilterJsInteropExports(options)); diff --git a/dev/core/src/com/google/gwt/dev/PrecompileTaskOptionsImpl.java b/dev/core/src/com/google/gwt/dev/PrecompileTaskOptionsImpl.java index b8a38e11427..682c06ce441 100644 --- a/dev/core/src/com/google/gwt/dev/PrecompileTaskOptionsImpl.java +++ b/dev/core/src/com/google/gwt/dev/PrecompileTaskOptionsImpl.java @@ -78,11 +78,6 @@ public int getFragmentCount() { return jjsOptions.getFragmentCount(); } - @Override - public int getFragmentsMerge() { - return jjsOptions.getFragmentsMerge(); - } - @Override public File getGenDir() { return genDir; @@ -232,11 +227,6 @@ public void setFragmentCount(int numFragments) { jjsOptions.setFragmentCount(numFragments); } - @Override - public void setFragmentsMerge(int numFragments) { - jjsOptions.setFragmentsMerge(numFragments); - } - @Override public void setGenDir(File genDir) { this.genDir = genDir; diff --git a/dev/core/src/com/google/gwt/dev/RunWebApp.java b/dev/core/src/com/google/gwt/dev/RunWebApp.java deleted file mode 100644 index e6c09dd54d8..00000000000 --- a/dev/core/src/com/google/gwt/dev/RunWebApp.java +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Copyright 2009 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.gwt.dev; - -import com.google.gwt.core.ext.ServletContainer; -import com.google.gwt.core.ext.TreeLogger; -import com.google.gwt.dev.DevModeBase.OptionPort; -import com.google.gwt.dev.DevModeBase.OptionStartupURLs; -import com.google.gwt.dev.shell.jetty.JettyLauncher; -import com.google.gwt.dev.util.BrowserLauncher; -import com.google.gwt.dev.util.log.PrintWriterTreeLogger; -import com.google.gwt.util.tools.ArgHandlerExtra; - -import java.io.File; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** - * An utility class for running web apps with Jetty and launching the default - * browser. - * - * @deprecated This class is deprecated for removal, with no replacement. - */ -@Deprecated -public class RunWebApp { - - interface RunWebAppOptions extends OptionStartupURLs, OptionPort { - } - - static class RunWebAppOptionsImpl implements RunWebAppOptions { - private int port; - private final List startupURLs = new ArrayList(); - - @Override - public void addStartupURL(String url) { - startupURLs.add(url); - } - - @Override - public int getPort() { - return port; - } - - @Override - public List getStartupURLs() { - return Collections.unmodifiableList(startupURLs); - } - - @Override - public void setPort(int port) { - this.port = port; - } - } - - private class ArgHandlerWar extends ArgHandlerExtra { - @Override - public boolean addExtraArg(String arg) { - warFile = new File(arg); - if (!warFile.exists()) { - System.err.println("Could not open war file '" - + warFile.getAbsolutePath() + "'"); - return false; - } - return true; - } - - @Override - public String getPurpose() { - return "Specifies the location of the target .war file or war directory"; - } - - @Override - public String[] getTagArgs() { - return new String[] {"war"}; - } - - @Override - public boolean isRequired() { - return true; - } - } - - private class ArgProcessor extends ArgProcessorBase { - public ArgProcessor(RunWebAppOptions options) { - registerHandler(new DevMode.ArgHandlerStartupURLs(options)); - registerHandler(new DevModeBase.ArgHandlerPort(options)); - registerHandler(new ArgHandlerWar()); - } - - @Override - protected String getName() { - return RunWebApp.class.getName(); - } - } - - public static void main(String[] args) { - try { - RunWebAppOptionsImpl options = new RunWebAppOptionsImpl(); - RunWebApp runWebApp = new RunWebApp(options); - ArgProcessor argProcessor = runWebApp.new ArgProcessor(options); - if (argProcessor.processArgs(args)) { - runWebApp.run(); - } - } catch (Exception e) { - System.err.println("Unable to start Jetty server"); - e.printStackTrace(); - } - } - - protected File warFile; - - private final RunWebAppOptions options; - - public RunWebApp(RunWebAppOptions options) { - this.options = options; - } - - protected void run() { - PrintWriterTreeLogger logger = new PrintWriterTreeLogger(); - logger.log(TreeLogger.Type.WARN, - "RunWebApp is deprecated for removal, please run your server directly. Visit " + - "https://github.com/gwtproject/gwt/issues/9923 to discuss other options."); - logger.setMaxDetail(TreeLogger.WARN); - int port = options.getPort(); - try { - ServletContainer scl = new JettyLauncher().start(logger, port, warFile); - port = scl.getPort(); - } catch (Exception e) { - System.err.println("Unable to start Jetty server"); - e.printStackTrace(); - return; - } - if (options.getStartupURLs().isEmpty()) { - options.addStartupURL("/"); - } - for (String startupUrl : options.getStartupURLs()) { - startupUrl = DevModeBase.normalizeURL(startupUrl, false, port, - "localhost"); - try { - BrowserLauncher.browse(startupUrl); - } catch (IOException e) { - System.err.println("Unable to start " + startupUrl); - } catch (URISyntaxException e) { - System.err.println(startupUrl + " is not a valid URL"); - } - } - } -} diff --git a/dev/core/src/com/google/gwt/dev/SignatureDumper.java b/dev/core/src/com/google/gwt/dev/SignatureDumper.java deleted file mode 100644 index 278570c0387..00000000000 --- a/dev/core/src/com/google/gwt/dev/SignatureDumper.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright 2008 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.gwt.dev; - -import com.google.gwt.core.ext.typeinfo.JAbstractMethod; -import com.google.gwt.core.ext.typeinfo.JClassType; -import com.google.gwt.core.ext.typeinfo.JConstructor; -import com.google.gwt.core.ext.typeinfo.JField; -import com.google.gwt.core.ext.typeinfo.JMethod; -import com.google.gwt.core.ext.typeinfo.JParameter; -import com.google.gwt.core.ext.typeinfo.TypeOracle; - -import java.io.PrintStream; - -@Deprecated -class SignatureDumper { - - public interface Filter { - boolean shouldPrint(JAbstractMethod method); - - boolean shouldPrint(JClassType type); - - boolean shouldPrint(JField field); - } - - public static void dumpSignatures(TypeOracle typeOracle, PrintStream out, - Filter filter) { - out.println("# Contains all signatures dumped from the GWT compiler"); - out.println("FileVersion 1"); - out.println("GwtVersion " + About.getGwtVersionNum()); - out.print(dumpAllSignatures(typeOracle, filter)); - out.close(); - } - - private static void addMethods(JAbstractMethod[] methods, - StringBuilder result, Filter filter) { - for (JAbstractMethod currentMeth : methods) { - if (!filter.shouldPrint(currentMeth)) { - continue; - } - if (currentMeth.isConstructor() != null) { - result.append(" method "); - } else if (currentMeth.isMethod() != null) { - result.append(" method "); - if (currentMeth.isMethod().isStatic()) { - result.append("static "); - } - result.append(currentMeth.getName()); - } else { - continue; - } - result.append(" ("); - for (JParameter currentParam : currentMeth.getParameters()) { - result.append(currentParam.getType().getJNISignature()); - } - result.append(')'); - if (currentMeth.isConstructor() != null) { - result.append('V'); - } else { - result.append(((JMethod) currentMeth).getReturnType().getJNISignature()); - } - result.append('\n'); - } - } - - private static void addFields(JField[] fields, StringBuilder result, Filter filter) { - for (JField currentField : fields) { - if (!filter.shouldPrint(currentField)) { - continue; - } - result.append(" field "); - if (currentField.isStatic()) { - result.append("static "); - } - result.append(currentField.getName()); - result.append(' '); - result.append(currentField.getType().getJNISignature()); - result.append('\n'); - } - } - - /** - * Dumps the signatures within this typeOracle. Singatures may appear multiple - * times. - */ - private static String dumpAllSignatures(TypeOracle typeOracle, Filter filter) { - StringBuilder result = new StringBuilder(); - for (JClassType current : typeOracle.getTypes()) { - if (!filter.shouldPrint(current)) { - continue; - } - if (current.isInterface() != null) { - result.append("interface "); - } else { - result.append("class "); - } - result.append(current.getJNISignature()); - JClassType superclass = current.getSuperclass(); - if (superclass != null) { - result.append(" extends "); - result.append(superclass.getJNISignature()); - } - for (JClassType currentInterface : current.getImplementedInterfaces()) { - result.append(" implements "); - result.append(currentInterface.getJNISignature()); - } - result.append('\n'); - - result.append(" method static ()V\n"); - JConstructor[] constructors = current.getConstructors(); - if (constructors.length == 0) { - result.append(" method ()V\n"); - } else { - addMethods(constructors, result, filter); - } - addMethods(current.getMethods(), result, filter); - - addFields(current.getFields(), result, filter); - - // If the parent class was filtered out, we might be missing some public API in the output - // as they will be inherited by the current class. So let's add those as well: - for (JClassType c = superclass; c != null && !filter.shouldPrint(c); c = c.getSuperclass()) { - addMethods(c.getMethods(), result, filter); - addFields(c.getFields(), result, filter); - } - } - return result.toString(); - } - -} diff --git a/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java b/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java index 210d0204c3e..2c530c4bd46 100644 --- a/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java +++ b/dev/core/src/com/google/gwt/dev/jjs/JJSOptions.java @@ -22,7 +22,6 @@ import com.google.gwt.dev.util.arg.OptionDisableClassMetadata; import com.google.gwt.dev.util.arg.OptionEnableAssertions; import com.google.gwt.dev.util.arg.OptionFragmentCount; -import com.google.gwt.dev.util.arg.OptionFragmentsMerge; import com.google.gwt.dev.util.arg.OptionGenerateJsInteropExports; import com.google.gwt.dev.util.arg.OptionIncrementalCompile; import com.google.gwt.dev.util.arg.OptionInlineLiteralParameters; @@ -50,7 +49,7 @@ public interface JJSOptions extends OptionOptimize, OptionEnableAssertions, OptionInlineLiteralParameters, OptionOptimizeDataflow, OptionRunAsyncEnabled, OptionScriptStyle, OptionSoycEnabled, OptionSoycDetailed, OptionJsonSoycEnabled, OptionOrdinalizeEnums, OptionRemoveDuplicateFunctions, OptionStrict, - OptionSoycHtmlDisabled, OptionFragmentsMerge, OptionFragmentCount, OptionSourceLevel, - OptionNamespace, OptionCheckedMode, OptionGenerateJsInteropExports, OptionUseDetailedTypeIds, + OptionSoycHtmlDisabled, OptionFragmentCount, OptionSourceLevel, OptionNamespace, + OptionCheckedMode, OptionGenerateJsInteropExports, OptionUseDetailedTypeIds, OptionAllowJDTConstantInlining, OptionMethodNameDisplayMode, OptionClosureFormattedOutput { } diff --git a/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java b/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java index 2d9e8c3c01d..c897ac83f8f 100644 --- a/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java +++ b/dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java @@ -67,7 +67,6 @@ public void copyFrom(JJSOptions other) { setCompilerMetricsEnabled(other.isCompilerMetricsEnabled()); setEnableAssertions(other.isEnableAssertions()); setFragmentCount(other.getFragmentCount()); - setFragmentsMerge(other.getFragmentsMerge()); setInlineLiteralParameters(other.shouldInlineLiteralParameters()); setOptimizationLevel(other.getOptimizationLevel()); setOptimizeDataflow(other.shouldOptimizeDataflow()); @@ -94,11 +93,6 @@ public int getFragmentCount() { return fragmentCount; } - @Override - public int getFragmentsMerge() { - return -1; - } - @Override public com.google.gwt.dev.util.arg.OptionMethodNameDisplayMode.Mode getMethodNameDisplayMode() { return methodNameDisplayMode; @@ -207,10 +201,6 @@ public void setFragmentCount(int numFragments) { this.fragmentCount = numFragments; } - @Override - public void setFragmentsMerge(int numFragments) { - } - @Override public void setInlineLiteralParameters(boolean enabled) { inlineLiteralParameters = enabled; diff --git a/dev/core/src/com/google/gwt/dev/shell/WorkDirs.java b/dev/core/src/com/google/gwt/dev/shell/WorkDirs.java deleted file mode 100644 index 6e8d5c7bcda..00000000000 --- a/dev/core/src/com/google/gwt/dev/shell/WorkDirs.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2008 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.gwt.dev.shell; - -import com.google.gwt.dev.cfg.ModuleDef; - -import java.io.File; - -/** - * Deprecated for removal, the compiler no longer uses this to create work directories. - */ -@Deprecated -public interface WorkDirs { - /** - * Gets the compiler output directory for a particular module. - */ - File getCompilerOutputDir(ModuleDef moduleDef); - - /** - * Gets the shell work directory for public generated files for a particular - * module. - */ - File getShellPublicGenDir(ModuleDef moduleDef); -} diff --git a/dev/core/src/com/google/gwt/dev/shell/log/ServletContextTreeLogger.java b/dev/core/src/com/google/gwt/dev/shell/log/ServletContextTreeLogger.java deleted file mode 100644 index b38ca2ae522..00000000000 --- a/dev/core/src/com/google/gwt/dev/shell/log/ServletContextTreeLogger.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2006 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.gwt.dev.shell.log; - -import com.google.gwt.dev.util.log.AbstractTreeLogger; - -import javax.servlet.ServletContext; - -/** - * Tree logger that logs servlet context information. - * - * @deprecated This class is deprecated for removal, with no replacement. - */ -@Deprecated -public class ServletContextTreeLogger extends AbstractTreeLogger { - - private final ServletContext ctx; - - public ServletContextTreeLogger(ServletContext ctx) { - this.ctx = ctx; - } - - @Override - protected AbstractTreeLogger doBranch() { - return new ServletContextTreeLogger(ctx); - } - - @Override - protected void doCommitBranch(AbstractTreeLogger childBeingCommitted, - Type type, String msg, Throwable caught, HelpInfo helpInfo) { - doLog(childBeingCommitted.getBranchedIndex(), type, msg, caught, helpInfo); - } - - @Override - protected void doLog(int indexOfLogEntryWithinParentLogger, Type type, - String msg, Throwable caught, HelpInfo helpInfo) { - if (caught != null) { - ctx.log(msg, caught); - } else { - ctx.log(msg); - } - } -} diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerDumpSignatures.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerDumpSignatures.java deleted file mode 100644 index 6029b243238..00000000000 --- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerDumpSignatures.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2009 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.gwt.dev.util.arg; - -import com.google.gwt.util.tools.ArgHandlerFile; - -import java.io.File; - -/** - * Argument handler for processing the script style flag. - */ -public final class ArgHandlerDumpSignatures extends ArgHandlerFile { - - public ArgHandlerDumpSignatures() { - } - - @Override - public String getPurpose() { - return "(deprecated) Dump the signatures of all loaded types and their members"; - } - - @Override - public String getTag() { - return "-dumpSignatures"; - } - - @Override - public String[] getTagArgs() { - return new String[]{"style"}; - } - - @Override - public boolean isUndocumented() { - return true; - } - - @Override - public void setFile(File file) { - System.err.println("[WARN] '" + getTag() + "' is deprecated; ignoring"); - } -} diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerFragmentMerge.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerFragmentMerge.java deleted file mode 100644 index 8042f2e4983..00000000000 --- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerFragmentMerge.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2011 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.gwt.dev.util.arg; - -import com.google.gwt.util.tools.ArgHandlerNoopDeprecatedFlag; - -/** - * An ArgHandler to provide the -XfragmentMerge flag. - */ -@Deprecated -public class ArgHandlerFragmentMerge extends ArgHandlerNoopDeprecatedFlag { - public ArgHandlerFragmentMerge() { - super(1, "numFragments"); - } -} diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerOutDir.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerOutDir.java deleted file mode 100644 index a0ed09ab195..00000000000 --- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerOutDir.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2006 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.gwt.dev.util.arg; - -import com.google.gwt.util.tools.ArgHandlerDir; - -import java.io.File; - -/** - * Argument handler for processing the output directory flag. - */ -public class ArgHandlerOutDir extends ArgHandlerDir { - - private final OptionOutDir option; - - public ArgHandlerOutDir(OptionOutDir option) { - this.option = option; - } - - @Override - public String[] getDefaultArgs() { - return new String[] {getTag(), System.getProperty("user.dir")}; - } - - @Override - public String getPurpose() { - return "The directory to write output files into (defaults to current)"; - } - - @Override - public String getTag() { - return "-out"; - } - - @Override - public void setDir(File dir) { - option.setOutDir(dir); - } - -} diff --git a/dev/core/src/com/google/gwt/dev/util/arg/OptionFinalProperties.java b/dev/core/src/com/google/gwt/dev/util/arg/OptionFinalProperties.java deleted file mode 100644 index c6950858a87..00000000000 --- a/dev/core/src/com/google/gwt/dev/util/arg/OptionFinalProperties.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2014 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.gwt.dev.util.arg; - -import com.google.gwt.dev.cfg.Properties; - -/** - * Deprecated for removal, no longer read by the compiler since the remainder of the - * library feature was removed. - */ -@Deprecated -public interface OptionFinalProperties { - - /** - * Returns the final properties. - */ - Properties getFinalProperties(); - - /** - * Sets the list of paths to input libraries. - */ - void setFinalProperties(Properties properties); -} diff --git a/dev/core/src/com/google/gwt/dev/util/arg/OptionFragmentsMerge.java b/dev/core/src/com/google/gwt/dev/util/arg/OptionFragmentsMerge.java deleted file mode 100644 index 398182ebd17..00000000000 --- a/dev/core/src/com/google/gwt/dev/util/arg/OptionFragmentsMerge.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2011 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.gwt.dev.util.arg; - -/** - * Enable the new code splitter that auto-partitions. - * - * @deprecated Use {@link OptionFragmentCount} instead. - */ -@Deprecated -public interface OptionFragmentsMerge { - // TODO(acleung): Delete this in favor of -XfragmentCount - - // TODO(acleung): This is currently an experimental frag. We should find a - // use case new splitter. Some possible approache: - // - // 1. Magically decide the number of fragments to merge. (May be too hard) - // 2. All the user to specify number of fragments they want to *keep* instead - // of the number they want to merge. - // 3. Ask the user what is the max (average) size of fragments. (This - // can only be an estimated. - - int getFragmentsMerge(); - - void setFragmentsMerge(int numFragments); -} diff --git a/dev/core/src/com/google/gwt/util/PreventSpuriousRebuilds.java b/dev/core/src/com/google/gwt/util/PreventSpuriousRebuilds.java deleted file mode 100644 index b2ef4674498..00000000000 --- a/dev/core/src/com/google/gwt/util/PreventSpuriousRebuilds.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2008 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.gwt.util; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * A dummy annotation applied to package-info.java to force it to generate a - * class file; this prevents javac from thinking package-info.java is always - * stale. - * @deprecated not needed anymore, - */ -@Target(ElementType.PACKAGE) -@Retention(RetentionPolicy.CLASS) -@Deprecated -public @interface PreventSpuriousRebuilds { -} From 10be845de53acc862eff9920cedd4e1e3c22659c Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Wed, 30 Apr 2025 13:55:59 -0500 Subject: [PATCH 2/4] Deprecate generator caching flag --- ...rgHandlerEnableGeneratorResultCaching.java | 39 +++---------------- .../OptionEnableGeneratorResultCaching.java | 3 +- 2 files changed, 7 insertions(+), 35 deletions(-) diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerEnableGeneratorResultCaching.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerEnableGeneratorResultCaching.java index 8f2f49351ef..3268afc8746 100644 --- a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerEnableGeneratorResultCaching.java +++ b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerEnableGeneratorResultCaching.java @@ -15,48 +15,19 @@ */ package com.google.gwt.dev.util.arg; -import com.google.gwt.util.tools.ArgHandlerFlag; +import com.google.gwt.util.tools.ArgHandlerNoopDeprecatedFlag; /** - * Caches results of generators with stable output. - * - * Note: This is no longer needed since generator result caching is now enabled by default. - * It's left here for an interim period, so that uses of the flag can be removed. - * TODO(jbrosenberg): remove this after interim period. + * Unused, deprecated for removal. */ -public class ArgHandlerEnableGeneratorResultCaching extends ArgHandlerFlag { - +@Deprecated +public class ArgHandlerEnableGeneratorResultCaching extends ArgHandlerNoopDeprecatedFlag { public ArgHandlerEnableGeneratorResultCaching() { - addTagValue("-XenableGeneratorResultCaching", true); - } - - @Override - public String getPurposeSnippet() { - return "Cache results of generators with stable output."; - } - - @Override - public String getLabel() { - return "cacheGeneratorResults"; - } - - @Override - public boolean isUndocumented() { - return true; - } - - @Override - public boolean setFlag(boolean value) { - return true; + super(0, "enableGeneratorResultCaching"); } @Override public boolean isExperimental() { return true; } - - @Override - public boolean getDefaultValue() { - return true; - } } diff --git a/dev/core/src/com/google/gwt/dev/util/arg/OptionEnableGeneratorResultCaching.java b/dev/core/src/com/google/gwt/dev/util/arg/OptionEnableGeneratorResultCaching.java index f8281dd2403..1eb12f39484 100644 --- a/dev/core/src/com/google/gwt/dev/util/arg/OptionEnableGeneratorResultCaching.java +++ b/dev/core/src/com/google/gwt/dev/util/arg/OptionEnableGeneratorResultCaching.java @@ -16,8 +16,9 @@ package com.google.gwt.dev.util.arg; /** - * Encapsulates a compiler option to enable generator result caching. + * Unused, deprecated for removal. */ +@Deprecated public interface OptionEnableGeneratorResultCaching { boolean isGeneratorResultCachingEnabled(); void setGeneratorResultCachingEnabled(boolean enabled); From 948227e873d11f83b53f478ede9c005e8aa6c429 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Wed, 30 Apr 2025 15:59:30 -0500 Subject: [PATCH 3/4] deprecate effectively dead class --- dev/core/src/com/google/gwt/core/ext/debug/JsoEval.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/core/src/com/google/gwt/core/ext/debug/JsoEval.java b/dev/core/src/com/google/gwt/core/ext/debug/JsoEval.java index c6f35856c95..37e5ff53671 100644 --- a/dev/core/src/com/google/gwt/core/ext/debug/JsoEval.java +++ b/dev/core/src/com/google/gwt/core/ext/debug/JsoEval.java @@ -43,6 +43,7 @@ * "gamma"); * */ +@Deprecated public class JsoEval { /* TODO: Error messages generated from JsoEval are reported with mangled From 285523bd601c408b19e6a7520b035c8c63164812 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Wed, 30 Apr 2025 13:56:36 -0500 Subject: [PATCH 4/4] Remove RF jar extractor from all production jars --- servlet/build.xml | 4 ++++ user/build.xml | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/servlet/build.xml b/servlet/build.xml index d918a4436a4..685f4aca7a2 100644 --- a/servlet/build.xml +++ b/servlet/build.xml @@ -43,6 +43,7 @@ + @@ -63,6 +64,7 @@ + @@ -89,6 +91,7 @@ + @@ -109,6 +112,7 @@ + diff --git a/user/build.xml b/user/build.xml index 2af156012ff..ad4e66cae45 100755 --- a/user/build.xml +++ b/user/build.xml @@ -290,9 +290,13 @@ description="Build and package this project"> - + + + - + + +