mbien commented on code in PR #6542:
URL: https://github.com/apache/netbeans/pull/6542#discussion_r1350233495
##########
enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java:
##########
@@ -480,6 +459,9 @@ public static int getVersionFromInstallDirectory(File
glassfishDir) {
case GF_7_0_4: return GLASSFISH_SERVER_7_0_4.getVersion();
case GF_7_0_5: return GLASSFISH_SERVER_7_0_5.getVersion();
case GF_7_0_6: return GLASSFISH_SERVER_7_0_6.getVersion();
+ case GF_7_0_7: return GLASSFISH_SERVER_7_0_7.getVersion();
+ case GF_7_0_8: return GLASSFISH_SERVER_7_0_8.getVersion();
+ case GF_7_0_9: return GLASSFISH_SERVER_7_0_9.getVersion();
Review Comment:
can this switch be eliminated by putting `GLASSFISH_SERVER_` enums into
`GF_7_` enums during construction?
##########
enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java:
##########
@@ -367,7 +350,56 @@ public enum ServerDetails {
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.6/glassfish-7.0.6.zip";,
// NOI18N
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.6/glassfish-7.0.6.zip";,
// NOI18N
"http://www.eclipse.org/legal/epl-2.0"; //NOI18N
+ ),
+
+ /**
+ * details for an instance of GlassFish Server 7.0.7
+ */
+ GLASSFISH_SERVER_7_0_7(NbBundle.getMessage(ServerDetails.class,
"STR_707_SERVER_NAME", new Object[]{}), // NOI18N
+ "deployer:gfv700ee10", // NOI18N
+ 707,
+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.7/glassfish-7.0.7.zip";,
// NOI18N
+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.7/glassfish-7.0.7.zip";,
// NOI18N
+ "http://www.eclipse.org/legal/epl-2.0"; //NOI18N
+ ),
+
+ /**
+ * details for an instance of GlassFish Server 7.0.8
+ */
+ GLASSFISH_SERVER_7_0_8(NbBundle.getMessage(ServerDetails.class,
"STR_708_SERVER_NAME", new Object[]{}), // NOI18N
+ "deployer:gfv700ee10", // NOI18N
+ 708,
+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.8/glassfish-7.0.8.zip";,
// NOI18N
+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.8/glassfish-7.0.8.zip";,
// NOI18N
+ "http://www.eclipse.org/legal/epl-2.0"; //NOI18N
+ ),
+
+ /**
+ * details for an instance of GlassFish Server 7.0.9
+ */
+ GLASSFISH_SERVER_7_0_9(NbBundle.getMessage(ServerDetails.class,
"STR_709_SERVER_NAME", new Object[]{}), // NOI18N
+ "deployer:gfv700ee10", // NOI18N
+ 709,
+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.9/glassfish-7.0.9.zip";,
// NOI18N
+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.9/glassfish-7.0.9.zip";,
// NOI18N
+ "http://www.eclipse.org/legal/epl-2.0"; //NOI18N
);
+
+ /**
+ * Array with all GlassFish {@code ServerDetails} versions.
+ */
+ private static final ServerDetails[] serverDetails = new ServerDetails[] {
+ GLASSFISH_SERVER_3, GLASSFISH_SERVER_3_0_1, GLASSFISH_SERVER_3_1,
+ GLASSFISH_SERVER_3_1_1, GLASSFISH_SERVER_3_1_2,
GLASSFISH_SERVER_3_1_2_2,
+ GLASSFISH_SERVER_4_0, GLASSFISH_SERVER_4_0_1, GLASSFISH_SERVER_4_1,
+ GLASSFISH_SERVER_4_1_1, GLASSFISH_SERVER_4_1_2,
GLASSFISH_SERVER_5_0,
+ GLASSFISH_SERVER_5_0_1, GLASSFISH_SERVER_5_1_0, GLASSFISH_SERVER_6,
+ GLASSFISH_SERVER_6_1_0, GLASSFISH_SERVER_6_2_0,
GLASSFISH_SERVER_6_2_1,
+ GLASSFISH_SERVER_6_2_2, GLASSFISH_SERVER_6_2_3,
GLASSFISH_SERVER_6_2_4,
+ GLASSFISH_SERVER_6_2_5, GLASSFISH_SERVER_7_0_0,
GLASSFISH_SERVER_7_0_1,
+ GLASSFISH_SERVER_7_0_2, GLASSFISH_SERVER_7_0_3,
GLASSFISH_SERVER_7_0_4,
+ GLASSFISH_SERVER_7_0_5, GLASSFISH_SERVER_7_0_6,
GLASSFISH_SERVER_7_0_7,
+ GLASSFISH_SERVER_7_0_8, GLASSFISH_SERVER_7_0_9 };
Review Comment:
this is now the same as `ServerDetails.values()`, no?
##########
enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java:
##########
@@ -202,6 +212,8 @@ public String toString() {
case v18: return V18_STR;
case v19: return V19_STR;
case v20: return V20_STR;
+ case v21: return V21_STR;
+ case v22: return V22_STR;
Review Comment:
the whole `toString` body can be replaced with:
```
String n = name();
return n.startsWith("v1_") ? "1."+n.substring(3) : n.substring(1);
```
after that the package private Strings can be removed too
alternative:
add string to enum, e.g v22("22") but its a bit redundant.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
