Skip to content

Commit d6ffc51

Browse files
authored
Remove deprecated or internal types, mark unused code deprecated (#9925)
Fixes #9923 Fixes #9921
1 parent 53606b5 commit d6ffc51

37 files changed

+70
-834
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import com.google.gwt.dev.util.InstalledHelpInfo;
3434
import com.google.gwt.dev.util.Util;
3535
import com.google.gwt.dev.util.arg.ArgHandlerDeployDir;
36-
import com.google.gwt.dev.util.arg.ArgHandlerDeprecatedDisableUpdateCheck;
3736
import com.google.gwt.dev.util.arg.ArgHandlerExtraDir;
3837
import com.google.gwt.dev.util.arg.ArgHandlerFilterJsInteropExports;
3938
import com.google.gwt.dev.util.arg.ArgHandlerGenerateJsInteropExports;
@@ -246,7 +245,6 @@ public ArgProcessor(HostedModeOptions options) {
246245
registerHandler(new ArgHandlerExtraDir(options));
247246
registerHandler(new ArgHandlerModulePathPrefix(options));
248247
registerHandler(new ArgHandlerWorkDirOptional(options));
249-
registerHandler(new ArgHandlerDeprecatedDisableUpdateCheck());
250248
registerHandler(new ArgHandlerMethodNameDisplayMode(options));
251249
registerHandler(new ArgHandlerSourceLevel(options));
252250
registerHandler(new ArgHandlerGenerateJsInteropExports(options));

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030

3131
/**
3232
* Entry point that outputs the GWT JRE support.
33+
*
34+
* @deprecated This class is deprecated for removal, with no replacement.
3335
*/
36+
@Deprecated
3437
public class GetJreEmulation {
3538

3639
/**
@@ -68,6 +71,10 @@ public static void main(String[] args) {
6871
PrintWriterTreeLogger logger = new PrintWriterTreeLogger(new PrintWriter(
6972
System.err, true));
7073
logger.setMaxDetail(TreeLogger.WARN);
74+
logger.log(TreeLogger.Type.WARN,
75+
"GetJreEmulation is deprecated for removal, please consider other options to get " +
76+
"this information from the GWT jar. See https://github.com/gwtproject/gwt/issues/9923 " +
77+
"to discuss other options.");
7178
CompilerContext.Builder compilerContextBuilder = new CompilerContext.Builder();
7279
CompilerContext compilerContext = compilerContextBuilder.build();
7380
ModuleDef module =

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

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.google.gwt.dev.util.arg.ArgHandlerClosureFormattedOutput;
2020
import com.google.gwt.dev.util.arg.ArgHandlerCompileReport;
2121
import com.google.gwt.dev.util.arg.ArgHandlerCompilerMetrics;
22-
import com.google.gwt.dev.util.arg.ArgHandlerDeprecatedDisableUpdateCheck;
2322
import com.google.gwt.dev.util.arg.ArgHandlerDeprecatedOptimizeDataflow;
2423
import com.google.gwt.dev.util.arg.ArgHandlerDisableCastChecking;
2524
import com.google.gwt.dev.util.arg.ArgHandlerDisableClassMetadata;
@@ -38,21 +37,17 @@
3837
import com.google.gwt.dev.util.arg.ArgHandlerFragmentMerge;
3938
import com.google.gwt.dev.util.arg.ArgHandlerGenDir;
4039
import com.google.gwt.dev.util.arg.ArgHandlerGenerateJsInteropExports;
41-
import com.google.gwt.dev.util.arg.ArgHandlerIncrementalCompileWarnings;
4240
import com.google.gwt.dev.util.arg.ArgHandlerJsonSoyc;
4341
import com.google.gwt.dev.util.arg.ArgHandlerMethodNameDisplayMode;
44-
import com.google.gwt.dev.util.arg.ArgHandlerMissingDepsFile;
4542
import com.google.gwt.dev.util.arg.ArgHandlerNamespace;
4643
import com.google.gwt.dev.util.arg.ArgHandlerOptimize;
47-
import com.google.gwt.dev.util.arg.ArgHandlerOverlappingSourceWarnings;
4844
import com.google.gwt.dev.util.arg.ArgHandlerSaveSource;
4945
import com.google.gwt.dev.util.arg.ArgHandlerScriptStyle;
5046
import com.google.gwt.dev.util.arg.ArgHandlerSetProperties;
5147
import com.google.gwt.dev.util.arg.ArgHandlerSourceLevel;
5248
import com.google.gwt.dev.util.arg.ArgHandlerSoyc;
5349
import com.google.gwt.dev.util.arg.ArgHandlerSoycDetailed;
5450
import com.google.gwt.dev.util.arg.ArgHandlerStrict;
55-
import com.google.gwt.dev.util.arg.ArgHandlerStrictResources;
5651
import com.google.gwt.dev.util.arg.ArgHandlerValidateOnlyFlag;
5752

5853
class PrecompileTaskArgProcessor extends CompileArgProcessor {
@@ -71,29 +66,24 @@ public PrecompileTaskArgProcessor(PrecompileTaskOptions options) {
7166
registerHandler(new ArgHandlerDisableOrdinalizeEnums(options));
7267
registerHandler(new ArgHandlerDisableRunAsync(options));
7368
registerHandler(new ArgHandlerDisableSoycHtml(options));
74-
registerHandler(new ArgHandlerDeprecatedDisableUpdateCheck());
7569
registerHandler(new ArgHandlerDraftCompile(options));
7670
registerHandler(new ArgHandlerDumpSignatures());
7771
registerHandler(new ArgHandlerEnableAssertions(options));
7872
registerHandler(new ArgHandlerFragmentCount(options));
79-
registerHandler(new ArgHandlerFragmentMerge(options));
73+
registerHandler(new ArgHandlerFragmentMerge());
8074
registerHandler(new ArgHandlerGenDir(options));
81-
registerHandler(new ArgHandlerIncrementalCompileWarnings());
8275
registerHandler(new ArgHandlerGenerateJsInteropExports(options));
8376
registerHandler(new ArgHandlerFilterJsInteropExports(options));
8477
registerHandler(new ArgHandlerMethodNameDisplayMode(options));
85-
registerHandler(new ArgHandlerMissingDepsFile());
8678
registerHandler(new ArgHandlerNamespace(options));
8779
registerHandler(new ArgHandlerOptimize(options));
88-
registerHandler(new ArgHandlerOverlappingSourceWarnings());
8980
registerHandler(new ArgHandlerSaveSource(options));
9081
registerHandler(new ArgHandlerSetProperties(options));
9182
registerHandler(new ArgHandlerScriptStyle(options));
9283
registerHandler(new ArgHandlerSoyc(options));
9384
registerHandler(new ArgHandlerSoycDetailed(options));
9485
registerHandler(new ArgHandlerJsonSoyc(options));
9586
registerHandler(new ArgHandlerStrict(options));
96-
registerHandler(new ArgHandlerStrictResources());
9787
registerHandler(new ArgHandlerValidateOnlyFlag(options));
9888
registerHandler(new ArgHandlerSourceLevel(options));
9989
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
/**
3535
* An utility class for running web apps with Jetty and launching the default
3636
* browser.
37+
*
38+
* @deprecated This class is deprecated for removal, with no replacement.
3739
*/
40+
@Deprecated
3841
public class RunWebApp {
3942

4043
interface RunWebAppOptions extends OptionStartupURLs, OptionPort {
@@ -130,6 +133,9 @@ public RunWebApp(RunWebAppOptions options) {
130133

131134
protected void run() {
132135
PrintWriterTreeLogger logger = new PrintWriterTreeLogger();
136+
logger.log(TreeLogger.Type.WARN,
137+
"RunWebApp is deprecated for removal, please run your server directly. Visit " +
138+
"https://github.com/gwtproject/gwt/issues/9923 to discuss other options.");
133139
logger.setMaxDetail(TreeLogger.WARN);
134140
int port = options.getPort();
135141
try {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import java.io.PrintStream;
2727

28+
@Deprecated
2829
class SignatureDumper {
2930

3031
public interface Filter {

dev/core/src/com/google/gwt/dev/jjs/JJSOptionsImpl.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class JJSOptionsImpl implements JJSOptions, Serializable {
3535
private boolean disableClassMetadata = false;
3636
private boolean enableAssertions;
3737
private int fragmentCount = -1;
38-
private int fragmentsMerge = -1;
3938
private boolean inlineLiteralParameters = true;
4039
private boolean jsonSoycEnabled = false;
4140
private JsNamespaceOption namespace = JsNamespaceOption.NONE;
@@ -97,7 +96,7 @@ public int getFragmentCount() {
9796

9897
@Override
9998
public int getFragmentsMerge() {
100-
return fragmentsMerge;
99+
return -1;
101100
}
102101

103102
@Override
@@ -210,7 +209,6 @@ public void setFragmentCount(int numFragments) {
210209

211210
@Override
212211
public void setFragmentsMerge(int numFragments) {
213-
this.fragmentsMerge = numFragments;
214212
}
215213

216214
@Override

dev/core/src/com/google/gwt/dev/jjs/JavaToJavaScriptCompiler.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -578,18 +578,6 @@ private Pair<SyntheticArtifact, MultipleDependencyGraphRecorder> splitJsIntoFrag
578578
ByteArrayOutputStream baos = new ByteArrayOutputStream();
579579

580580
int expectedFragmentCount = options.getFragmentCount();
581-
// -1 is the default value, we trap 0 just in case (0 is not a legal value in any case)
582-
if (expectedFragmentCount <= 0) {
583-
// Fragment count not set check fragments merge.
584-
int numberOfMerges = options.getFragmentsMerge();
585-
if (numberOfMerges > 0) {
586-
// + 1 for left over, + 1 for initial gave us the total number
587-
// of fragments without splitting.
588-
expectedFragmentCount =
589-
Math.max(0, jprogram.getRunAsyncs().size() + 2 - numberOfMerges);
590-
}
591-
}
592-
593581
int minFragmentSize = properties.getConfigurationProperties()
594582
.getInteger(CodeSplitters.MIN_FRAGMENT_SIZE, 0);
595583

dev/core/src/com/google/gwt/dev/shell/HostedModeServletConfigProxy.java

Lines changed: 0 additions & 74 deletions
This file was deleted.

dev/core/src/com/google/gwt/dev/shell/WorkDirs.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
import java.io.File;
2121

2222
/**
23-
* Provides information about work directories.
23+
* Deprecated for removal, the compiler no longer uses this to create work directories.
2424
*/
25+
@Deprecated
2526
public interface WorkDirs {
2627
/**
2728
* Gets the compiler output directory for a particular module.

dev/core/src/com/google/gwt/dev/shell/log/ServletContextTreeLogger.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121

2222
/**
2323
* Tree logger that logs servlet context information.
24+
*
25+
* @deprecated This class is deprecated for removal, with no replacement.
2426
*/
27+
@Deprecated
2528
public class ServletContextTreeLogger extends AbstractTreeLogger {
2629

2730
private final ServletContext ctx;

0 commit comments

Comments
 (0)