From 12031d7d87d0a5acba963d6e5a1d1ba320c35770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Contreras?= Date: Mon, 2 Oct 2023 18:29:48 -0600 Subject: [PATCH] - Add support for GlassFish version 7.0.7, 7.0.8, and 7.0.9 - Add new ConfigBuilderProvider for GlassFish 7.0.9 and newer with support for Java 21 - Add support for JavaSE constants up to version 22 - Bump `javac.source` and `javac.target` to version 11 for all 4 GlassFish modules `common`,`eecommon`,`javaee`, and `tooling` - Refactor creation of `ServerWizardIterator` with one private array - Use ConcurrentMap for `builders`, set initial capacity, use atomic operations `computeIfPresent` and `computeIfAbsent`, and remove some synchronized blocks because the ConcurrentHashMap implementation already use synchronized at a Node level - Generate sigtest because `check-sigtests-release` failed - Add a new method that return a numeric representation of the server version - Refactor the String representation of the Enums with a single method. Thanks to @mbien - Integrate `GlassFishVersion` enum to `ServerDetails` constructor and replace instance field `versionInt` with it - Use `GlassfishInstanceProvider` instances when creating a new `ServerDetails` enum - Refactor switch statement with single method `version.toFullInteger()` from the new `GlassFishVersion` instance - Refactor serverDetails array to one call to `ServerDetails.values()` - The `getBuilder` method can return a ConfigBuilder instance with just one atomic and non-blocking operation `computeIfAbsent`. Thanks to @mbien - Refactor long switch statement to one `if if-else else` statement - Remove unnecessary imports - Make final some instances --- .../org-netbeans-modules-glassfish-common.sig | 305 +++++++++++++----- .../nbproject/project.properties | 3 +- .../glassfish/common/Bundle.properties | 3 + .../glassfish/common/ServerDetails.java | 287 +++++++--------- ...rg-netbeans-modules-glassfish-eecommon.sig | 209 +++++++----- .../nbproject/project.properties | 3 +- .../nbproject/project.properties | 3 +- .../nbproject/project.properties | 3 +- .../glassfish/tooling/admin/AdminFactory.java | 57 +--- .../tooling/data/GlassFishVersion.java | 42 ++- .../server/config/ConfigBuilderProvider.java | 48 +-- .../tooling/server/config/GlassFishV7_0_9.xml | 96 ++++++ .../tooling/server/config/JavaSEPlatform.java | 89 +---- .../tooling/admin/AdminFactoryTest.java | 2 +- .../tooling/data/GlassFishVersionTest.java | 11 +- .../tooling/utils/EnumUtilsTest.java | 26 +- 16 files changed, 675 insertions(+), 512 deletions(-) create mode 100644 enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV7_0_9.xml diff --git a/enterprise/glassfish.common/nbproject/org-netbeans-modules-glassfish-common.sig b/enterprise/glassfish.common/nbproject/org-netbeans-modules-glassfish-common.sig index 760de3d5ac73..a3d8e2363e80 100644 --- a/enterprise/glassfish.common/nbproject/org-netbeans-modules-glassfish-common.sig +++ b/enterprise/glassfish.common/nbproject/org-netbeans-modules-glassfish-common.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 1.95 +#Version 1.96 CLSS public abstract java.awt.Component cons protected init() @@ -17,6 +17,7 @@ intf java.awt.MenuContainer intf java.awt.image.ImageObserver intf java.io.Serializable meth protected boolean requestFocus(boolean) +meth protected boolean requestFocus(boolean,java.awt.event.FocusEvent$Cause) meth protected boolean requestFocusInWindow(boolean) meth protected final void disableEvents(long) meth protected final void enableEvents(long) @@ -37,20 +38,20 @@ meth protected void processMouseMotionEvent(java.awt.event.MouseEvent) meth protected void processMouseWheelEvent(java.awt.event.MouseWheelEvent) meth public <%0 extends java.util.EventListener> {%%0}[] getListeners(java.lang.Class<{%%0}>) meth public boolean action(java.awt.Event,java.lang.Object) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean areFocusTraversalKeysSet(int) meth public boolean contains(int,int) meth public boolean contains(java.awt.Point) meth public boolean getFocusTraversalKeysEnabled() meth public boolean getIgnoreRepaint() meth public boolean gotFocus(java.awt.Event,java.lang.Object) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean handleEvent(java.awt.Event) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean hasFocus() meth public boolean imageUpdate(java.awt.Image,int,int,int,int,int) meth public boolean inside(int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean isBackgroundSet() meth public boolean isCursorSet() meth public boolean isDisplayable() @@ -59,7 +60,7 @@ meth public boolean isEnabled() meth public boolean isFocusCycleRoot(java.awt.Container) meth public boolean isFocusOwner() meth public boolean isFocusTraversable() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean isFocusable() meth public boolean isFontSet() meth public boolean isForegroundSet() @@ -72,28 +73,29 @@ meth public boolean isShowing() meth public boolean isValid() meth public boolean isVisible() meth public boolean keyDown(java.awt.Event,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean keyUp(java.awt.Event,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean lostFocus(java.awt.Event,java.lang.Object) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean mouseDown(java.awt.Event,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean mouseDrag(java.awt.Event,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean mouseEnter(java.awt.Event,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean mouseExit(java.awt.Event,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean mouseMove(java.awt.Event,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean mouseUp(java.awt.Event,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean postEvent(java.awt.Event) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean prepareImage(java.awt.Image,int,int,java.awt.image.ImageObserver) meth public boolean prepareImage(java.awt.Image,java.awt.image.ImageObserver) meth public boolean requestFocusInWindow() +meth public boolean requestFocusInWindow(java.awt.event.FocusEvent$Cause) meth public final java.lang.Object getTreeLock() meth public final void dispatchEvent(java.awt.AWTEvent) meth public float getAlignmentX() @@ -110,7 +112,7 @@ meth public java.awt.Color getForeground() meth public java.awt.Component getComponentAt(int,int) meth public java.awt.Component getComponentAt(java.awt.Point) meth public java.awt.Component locate(int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Component$BaselineResizeBehavior getBaselineResizeBehavior() meth public java.awt.ComponentOrientation getComponentOrientation() meth public java.awt.Container getFocusCycleRootAncestor() @@ -122,11 +124,11 @@ meth public java.awt.Dimension getPreferredSize() meth public java.awt.Dimension getSize() meth public java.awt.Dimension getSize(java.awt.Dimension) meth public java.awt.Dimension minimumSize() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Dimension preferredSize() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Dimension size() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Font getFont() meth public java.awt.FontMetrics getFontMetrics(java.awt.Font) meth public java.awt.Graphics getGraphics() @@ -138,9 +140,9 @@ meth public java.awt.Point getLocation(java.awt.Point) meth public java.awt.Point getLocationOnScreen() meth public java.awt.Point getMousePosition() meth public java.awt.Point location() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Rectangle bounds() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Rectangle getBounds() meth public java.awt.Rectangle getBounds(java.awt.Rectangle) meth public java.awt.Toolkit getToolkit() @@ -181,14 +183,14 @@ meth public void addPropertyChangeListener(java.beans.PropertyChangeListener) meth public void addPropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener) meth public void applyComponentOrientation(java.awt.ComponentOrientation) meth public void deliverEvent(java.awt.Event) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void disable() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void doLayout() meth public void enable() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void enable(boolean) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void enableInputMethods(boolean) meth public void firePropertyChange(java.lang.String,byte,byte) meth public void firePropertyChange(java.lang.String,char,char) @@ -197,19 +199,19 @@ meth public void firePropertyChange(java.lang.String,float,float) meth public void firePropertyChange(java.lang.String,long,long) meth public void firePropertyChange(java.lang.String,short,short) meth public void hide() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void invalidate() meth public void layout() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void list() meth public void list(java.io.PrintStream) meth public void list(java.io.PrintStream,int) meth public void list(java.io.PrintWriter) meth public void list(java.io.PrintWriter,int) meth public void move(int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void nextFocus() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void paint(java.awt.Graphics) meth public void paintAll(java.awt.Graphics) meth public void print(java.awt.Graphics) @@ -232,12 +234,13 @@ meth public void repaint(int,int,int,int) meth public void repaint(long) meth public void repaint(long,int,int,int,int) meth public void requestFocus() +meth public void requestFocus(java.awt.event.FocusEvent$Cause) meth public void reshape(int,int,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void resize(int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void resize(java.awt.Dimension) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void revalidate() meth public void setBackground(java.awt.Color) meth public void setBounds(int,int,int,int) @@ -257,15 +260,16 @@ meth public void setLocation(int,int) meth public void setLocation(java.awt.Point) meth public void setMaximumSize(java.awt.Dimension) meth public void setMinimumSize(java.awt.Dimension) +meth public void setMixingCutoutShape(java.awt.Shape) meth public void setName(java.lang.String) meth public void setPreferredSize(java.awt.Dimension) meth public void setSize(int,int) meth public void setSize(java.awt.Dimension) meth public void setVisible(boolean) meth public void show() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void show(boolean) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void transferFocus() meth public void transferFocusBackward() meth public void transferFocusUpCycle() @@ -293,7 +297,7 @@ meth public final void setFocusTraversalPolicyProvider(boolean) meth public float getAlignmentX() meth public float getAlignmentY() meth public int countComponents() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public int getComponentCount() meth public int getComponentZOrder(java.awt.Component) meth public java.awt.Component add(java.awt.Component) @@ -305,19 +309,19 @@ meth public java.awt.Component getComponent(int) meth public java.awt.Component getComponentAt(int,int) meth public java.awt.Component getComponentAt(java.awt.Point) meth public java.awt.Component locate(int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Component[] getComponents() meth public java.awt.Dimension getMaximumSize() meth public java.awt.Dimension getMinimumSize() meth public java.awt.Dimension getPreferredSize() meth public java.awt.Dimension minimumSize() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Dimension preferredSize() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.FocusTraversalPolicy getFocusTraversalPolicy() meth public java.awt.Insets getInsets() meth public java.awt.Insets insets() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.LayoutManager getLayout() meth public java.awt.Point getMousePosition(boolean) meth public java.awt.event.ContainerListener[] getContainerListeners() @@ -330,11 +334,11 @@ meth public void addPropertyChangeListener(java.beans.PropertyChangeListener) meth public void addPropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener) meth public void applyComponentOrientation(java.awt.ComponentOrientation) meth public void deliverEvent(java.awt.Event) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void doLayout() meth public void invalidate() meth public void layout() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void list(java.io.PrintStream,int) meth public void list(java.io.PrintWriter,int) meth public void paint(java.awt.Graphics) @@ -364,7 +368,7 @@ meth public abstract void removeItemListener(java.awt.event.ItemListener) CLSS public abstract interface java.awt.MenuContainer meth public abstract boolean postEvent(java.awt.Event) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public abstract java.awt.Font getFont() meth public abstract void remove(java.awt.MenuComponent) @@ -403,6 +407,15 @@ meth public void setShortDescription(java.lang.String) meth public void setValue(java.lang.String,java.lang.Object) supr java.lang.Object +CLSS public abstract interface !annotation java.beans.JavaBean + anno 0 java.lang.annotation.Documented() + anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) + anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) +intf java.lang.annotation.Annotation +meth public abstract !hasdefault java.lang.String defaultEventSet() +meth public abstract !hasdefault java.lang.String defaultProperty() +meth public abstract !hasdefault java.lang.String description() + CLSS public abstract interface java.io.Externalizable intf java.io.Serializable meth public abstract void readExternal(java.io.ObjectInput) throws java.io.IOException,java.lang.ClassNotFoundException @@ -449,6 +462,7 @@ CLSS public java.lang.Object cons public init() meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException meth protected void finalize() throws java.lang.Throwable + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="9") meth public boolean equals(java.lang.Object) meth public final java.lang.Class getClass() meth public final void notify() @@ -471,6 +485,7 @@ cons public init(java.lang.String) cons public init(java.lang.ThreadGroup,java.lang.Runnable) cons public init(java.lang.ThreadGroup,java.lang.Runnable,java.lang.String) cons public init(java.lang.ThreadGroup,java.lang.Runnable,java.lang.String,long) +cons public init(java.lang.ThreadGroup,java.lang.Runnable,java.lang.String,long,boolean) cons public init(java.lang.ThreadGroup,java.lang.String) fld public final static int MAX_PRIORITY = 10 fld public final static int MIN_PRIORITY = 1 @@ -490,18 +505,16 @@ meth public final void join() throws java.lang.InterruptedException meth public final void join(long) throws java.lang.InterruptedException meth public final void join(long,int) throws java.lang.InterruptedException meth public final void resume() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="1.2") meth public final void setDaemon(boolean) meth public final void setName(java.lang.String) meth public final void setPriority(int) meth public final void stop() - anno 0 java.lang.Deprecated() -meth public final void stop(java.lang.Throwable) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="1.2") meth public final void suspend() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="1.2") meth public int countStackFrames() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="1.2") meth public java.lang.ClassLoader getContextClassLoader() meth public java.lang.StackTraceElement[] getStackTrace() meth public java.lang.String toString() @@ -516,12 +529,11 @@ meth public static java.lang.Thread currentThread() meth public static java.lang.Thread$UncaughtExceptionHandler getDefaultUncaughtExceptionHandler() meth public static java.util.Map getAllStackTraces() meth public static void dumpStack() +meth public static void onSpinWait() meth public static void setDefaultUncaughtExceptionHandler(java.lang.Thread$UncaughtExceptionHandler) meth public static void sleep(long) throws java.lang.InterruptedException meth public static void sleep(long,int) throws java.lang.InterruptedException meth public static void yield() -meth public void destroy() - anno 0 java.lang.Deprecated() meth public void interrupt() meth public void run() meth public void setContextClassLoader(java.lang.ClassLoader) @@ -589,8 +601,11 @@ meth protected final java.net.InetAddress getRequestingSite() meth protected java.net.Authenticator$RequestorType getRequestorType() meth protected java.net.PasswordAuthentication getPasswordAuthentication() meth protected java.net.URL getRequestingURL() +meth public java.net.PasswordAuthentication requestPasswordAuthenticationInstance(java.lang.String,java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String,java.net.URL,java.net.Authenticator$RequestorType) +meth public static java.net.Authenticator getDefault() meth public static java.net.PasswordAuthentication requestPasswordAuthentication(java.lang.String,java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String) meth public static java.net.PasswordAuthentication requestPasswordAuthentication(java.lang.String,java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String,java.net.URL,java.net.Authenticator$RequestorType) +meth public static java.net.PasswordAuthentication requestPasswordAuthentication(java.net.Authenticator,java.lang.String,java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String,java.net.URL,java.net.Authenticator$RequestorType) meth public static java.net.PasswordAuthentication requestPasswordAuthentication(java.net.InetAddress,int,java.lang.String,java.lang.String,java.lang.String) meth public static void setDefault(java.net.Authenticator) supr java.lang.Object @@ -620,6 +635,8 @@ CLSS public abstract interface java.util.EventListener CLSS public abstract interface java.util.Map<%0 extends java.lang.Object, %1 extends java.lang.Object> innr public abstract interface static Entry +meth public !varargs static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> ofEntries(java.util.Map$Entry[]) + anno 0 java.lang.SafeVarargs() meth public abstract boolean containsKey(java.lang.Object) meth public abstract boolean containsValue(java.lang.Object) meth public abstract boolean equals(java.lang.Object) @@ -636,6 +653,19 @@ meth public abstract {java.util.Map%1} put({java.util.Map%0},{java.util.Map%1}) meth public abstract {java.util.Map%1} remove(java.lang.Object) meth public boolean remove(java.lang.Object,java.lang.Object) meth public boolean replace({java.util.Map%0},{java.util.Map%1},{java.util.Map%1}) +meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map$Entry<{%%0},{%%1}> entry({%%0},{%%1}) +meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> copyOf(java.util.Map) +meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> of() +meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> of({%%0},{%%1}) +meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> of({%%0},{%%1},{%%0},{%%1}) +meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> of({%%0},{%%1},{%%0},{%%1},{%%0},{%%1}) +meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> of({%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1}) +meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> of({%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1}) +meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> of({%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1}) +meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> of({%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1}) +meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> of({%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1}) +meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> of({%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1}) +meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> of({%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1},{%%0},{%%1}) meth public void forEach(java.util.function.BiConsumer) meth public void replaceAll(java.util.function.BiFunction) meth public {java.util.Map%1} compute({java.util.Map%0},java.util.function.BiFunction) @@ -693,8 +723,10 @@ meth public abstract void addPropertyChangeListener(java.beans.PropertyChangeLis meth public abstract void putValue(java.lang.String,java.lang.Object) meth public abstract void removePropertyChangeListener(java.beans.PropertyChangeListener) meth public abstract void setEnabled(boolean) +meth public boolean accept(java.lang.Object) CLSS public javax.swing.JComboBox<%0 extends java.lang.Object> + anno 0 java.beans.JavaBean(java.lang.String defaultEventSet="", java.lang.String defaultProperty="UI", java.lang.String description="A combination of a text field and a drop-down list.") cons public init() cons public init(java.util.Vector<{javax.swing.JComboBox%0}>) cons public init(javax.swing.ComboBoxModel<{javax.swing.JComboBox%0}>) @@ -729,21 +761,28 @@ meth public boolean isLightWeightPopupEnabled() meth public boolean isPopupVisible() meth public boolean selectWithKeyChar(char) meth public int getItemCount() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public int getMaximumRowCount() meth public int getSelectedIndex() meth public java.awt.event.ActionListener[] getActionListeners() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.awt.event.ItemListener[] getItemListeners() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.lang.Object getSelectedItem() meth public java.lang.Object[] getSelectedObjects() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.lang.String getActionCommand() meth public java.lang.String getUIClassID() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public javax.accessibility.AccessibleContext getAccessibleContext() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public javax.swing.Action getAction() meth public javax.swing.ComboBoxEditor getEditor() meth public javax.swing.ComboBoxModel<{javax.swing.JComboBox%0}> getModel() meth public javax.swing.JComboBox$KeySelectionManager getKeySelectionManager() meth public javax.swing.ListCellRenderer getRenderer() meth public javax.swing.event.PopupMenuListener[] getPopupMenuListeners() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public javax.swing.plaf.ComboBoxUI getUI() meth public void actionPerformed(java.awt.event.ActionEvent) meth public void addActionListener(java.awt.event.ActionListener) @@ -767,20 +806,33 @@ meth public void removeItemAt(int) meth public void removeItemListener(java.awt.event.ItemListener) meth public void removePopupMenuListener(javax.swing.event.PopupMenuListener) meth public void setAction(javax.swing.Action) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=true, java.lang.String description="the Action instance connected with this ActionEvent source", java.lang.String[] enumerationValues=[]) meth public void setActionCommand(java.lang.String) meth public void setEditable(boolean) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="If true, the user can type a new value in the combo box.", java.lang.String[] enumerationValues=[]) meth public void setEditor(javax.swing.ComboBoxEditor) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=true, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The editor that combo box uses to edit the current value", java.lang.String[] enumerationValues=[]) meth public void setEnabled(boolean) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="The enabled state of the component.", java.lang.String[] enumerationValues=[]) meth public void setKeySelectionManager(javax.swing.JComboBox$KeySelectionManager) + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=true, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The objects that changes the selection when a key is pressed.", java.lang.String[] enumerationValues=[]) meth public void setLightWeightPopupEnabled(boolean) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=true, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="Set to false to require heavyweight popups.", java.lang.String[] enumerationValues=[]) meth public void setMaximumRowCount(int) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="The maximum number of rows the popup should have", java.lang.String[] enumerationValues=[]) meth public void setModel(javax.swing.ComboBoxModel<{javax.swing.JComboBox%0}>) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="Model that the combo box uses to get data to display.", java.lang.String[] enumerationValues=[]) meth public void setPopupVisible(boolean) meth public void setPrototypeDisplayValue({javax.swing.JComboBox%0}) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=true, java.lang.String description="The display prototype value, used to compute display width and height.", java.lang.String[] enumerationValues=[]) meth public void setRenderer(javax.swing.ListCellRenderer) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=true, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The renderer that paints the item selected in the list.", java.lang.String[] enumerationValues=[]) meth public void setSelectedIndex(int) + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="The item at index is selected.", java.lang.String[] enumerationValues=[]) meth public void setSelectedItem(java.lang.Object) + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="Sets the selected item in the JComboBox.", java.lang.String[] enumerationValues=[]) meth public void setUI(javax.swing.plaf.ComboBoxUI) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=true, boolean preferred=false, boolean required=false, boolean visualUpdate=true, java.lang.String description="The UI object that implements the Component's LookAndFeel.", java.lang.String[] enumerationValues=[]) meth public void showPopup() meth public void updateUI() meth public {javax.swing.JComboBox%0} getItemAt(int) @@ -788,6 +840,7 @@ meth public {javax.swing.JComboBox%0} getPrototypeDisplayValue() supr javax.swing.JComponent CLSS public abstract javax.swing.JComponent + anno 0 java.beans.JavaBean(java.lang.String defaultEventSet="", java.lang.String defaultProperty="UIClassID", java.lang.String description="") cons public init() fld protected javax.swing.event.EventListenerList listenerList fld protected javax.swing.plaf.ComponentUI ui @@ -815,6 +868,7 @@ meth protected void processKeyEvent(java.awt.event.KeyEvent) meth protected void processMouseEvent(java.awt.event.MouseEvent) meth protected void processMouseMotionEvent(java.awt.event.MouseEvent) meth protected void setUI(javax.swing.plaf.ComponentUI) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=true, boolean preferred=false, boolean required=false, boolean visualUpdate=true, java.lang.String description="The component's look and feel delegate.", java.lang.String[] enumerationValues=[]) meth public <%0 extends java.util.EventListener> {%%0}[] getListeners(java.lang.Class<{%%0}>) meth public boolean contains(int,int) meth public boolean getAutoscrolls() @@ -822,17 +876,21 @@ meth public boolean getInheritsPopupMenu() meth public boolean getVerifyInputWhenFocusTarget() meth public boolean isDoubleBuffered() meth public boolean isManagingFocus() - anno 0 java.lang.Deprecated() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean isOpaque() meth public boolean isOptimizedDrawingEnabled() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public boolean isPaintingTile() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public boolean isRequestFocusEnabled() meth public boolean isValidateRoot() meth public boolean requestDefaultFocus() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean requestFocus(boolean) meth public boolean requestFocusInWindow() meth public final boolean isPaintingForPrint() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public final java.lang.Object getClientProperty(java.lang.Object) meth public final javax.swing.ActionMap getActionMap() meth public final javax.swing.InputMap getInputMap() @@ -846,39 +904,54 @@ meth public int getBaseline(int,int) meth public int getConditionForKeyStroke(javax.swing.KeyStroke) meth public int getDebugGraphicsOptions() meth public int getHeight() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public int getWidth() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public int getX() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public int getY() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.awt.Component getNextFocusableComponent() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Component$BaselineResizeBehavior getBaselineResizeBehavior() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.awt.Container getTopLevelAncestor() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.awt.Dimension getMaximumSize() meth public java.awt.Dimension getMinimumSize() meth public java.awt.Dimension getPreferredSize() meth public java.awt.Dimension getSize(java.awt.Dimension) meth public java.awt.FontMetrics getFontMetrics(java.awt.Font) meth public java.awt.Graphics getGraphics() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.awt.Insets getInsets() + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=true, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.awt.Insets getInsets(java.awt.Insets) meth public java.awt.Point getLocation(java.awt.Point) meth public java.awt.Point getPopupLocation(java.awt.event.MouseEvent) meth public java.awt.Point getToolTipLocation(java.awt.event.MouseEvent) meth public java.awt.Rectangle getBounds(java.awt.Rectangle) meth public java.awt.Rectangle getVisibleRect() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.awt.event.ActionListener getActionForKeyStroke(javax.swing.KeyStroke) meth public java.beans.VetoableChangeListener[] getVetoableChangeListeners() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.lang.String getToolTipText() meth public java.lang.String getToolTipText(java.awt.event.MouseEvent) meth public java.lang.String getUIClassID() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=true, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="UIClassID", java.lang.String[] enumerationValues=[]) meth public javax.swing.InputVerifier getInputVerifier() meth public javax.swing.JPopupMenu getComponentPopupMenu() meth public javax.swing.JRootPane getRootPane() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public javax.swing.JToolTip createToolTip() meth public javax.swing.KeyStroke[] getRegisteredKeyStrokes() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public javax.swing.TransferHandler getTransferHandler() meth public javax.swing.border.Border getBorder() meth public javax.swing.event.AncestorListener[] getAncestorListeners() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) +meth public javax.swing.plaf.ComponentUI getUI() meth public static boolean isLightweightComponent(java.awt.Component) meth public static java.util.Locale getDefaultLocale() meth public static void setDefaultLocale(java.util.Locale) @@ -887,15 +960,15 @@ meth public void addNotify() meth public void addVetoableChangeListener(java.beans.VetoableChangeListener) meth public void computeVisibleRect(java.awt.Rectangle) meth public void disable() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void enable() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void firePropertyChange(java.lang.String,boolean,boolean) meth public void firePropertyChange(java.lang.String,char,char) meth public void firePropertyChange(java.lang.String,int,int) meth public void grabFocus() meth public void hide() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void paint(java.awt.Graphics) meth public void paintImmediately(int,int,int,int) meth public void paintImmediately(java.awt.Rectangle) @@ -911,40 +984,61 @@ meth public void repaint(long,int,int,int,int) meth public void requestFocus() meth public void resetKeyboardActions() meth public void reshape(int,int,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void revalidate() meth public void scrollRectToVisible(java.awt.Rectangle) meth public void setAlignmentX(float) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The preferred horizontal alignment of the component.", java.lang.String[] enumerationValues=[]) meth public void setAlignmentY(float) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The preferred vertical alignment of the component.", java.lang.String[] enumerationValues=[]) meth public void setAutoscrolls(boolean) + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=true, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="Determines if this component automatically scrolls its contents when dragged.", java.lang.String[] enumerationValues=[]) meth public void setBackground(java.awt.Color) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The background color of the component.", java.lang.String[] enumerationValues=[]) meth public void setBorder(javax.swing.border.Border) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The component's border.", java.lang.String[] enumerationValues=[]) meth public void setComponentPopupMenu(javax.swing.JPopupMenu) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="Popup to show", java.lang.String[] enumerationValues=[]) meth public void setDebugGraphicsOptions(int) + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="Diagnostic options for graphics operations.", java.lang.String[] enumerationValues=["DebugGraphics.NONE_OPTION", "DebugGraphics.LOG_OPTION", "DebugGraphics.FLASH_OPTION", "DebugGraphics.BUFFERED_OPTION"]) meth public void setDoubleBuffered(boolean) meth public void setEnabled(boolean) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=true, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The enabled state of the component.", java.lang.String[] enumerationValues=[]) meth public void setFocusTraversalKeys(int,java.util.Set) meth public void setFont(java.awt.Font) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The font for the component.", java.lang.String[] enumerationValues=[]) meth public void setForeground(java.awt.Color) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The foreground color of the component.", java.lang.String[] enumerationValues=[]) meth public void setInheritsPopupMenu(boolean) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="Whether or not the JPopupMenu is inherited", java.lang.String[] enumerationValues=[]) meth public void setInputVerifier(javax.swing.InputVerifier) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The component's input verifier.", java.lang.String[] enumerationValues=[]) meth public void setMaximumSize(java.awt.Dimension) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The maximum size of the component.", java.lang.String[] enumerationValues=[]) meth public void setMinimumSize(java.awt.Dimension) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The minimum size of the component.", java.lang.String[] enumerationValues=[]) meth public void setNextFocusableComponent(java.awt.Component) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void setOpaque(boolean) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=true, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The component's opacity", java.lang.String[] enumerationValues=[]) meth public void setPreferredSize(java.awt.Dimension) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="The preferred size of the component.", java.lang.String[] enumerationValues=[]) meth public void setRequestFocusEnabled(boolean) meth public void setToolTipText(java.lang.String) + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="The text to display in a tool tip.", java.lang.String[] enumerationValues=[]) meth public void setTransferHandler(javax.swing.TransferHandler) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=true, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="Mechanism for transfer of data to and from the component", java.lang.String[] enumerationValues=[]) meth public void setVerifyInputWhenFocusTarget(boolean) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="Whether the Component verifies input before accepting focus.", java.lang.String[] enumerationValues=[]) meth public void setVisible(boolean) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=true, boolean preferred=false, boolean required=false, boolean visualUpdate=true, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public void unregisterKeyboardAction(javax.swing.KeyStroke) meth public void update(java.awt.Graphics) meth public void updateUI() supr java.awt.Container CLSS public javax.swing.JPanel + anno 0 java.beans.JavaBean(java.lang.String defaultEventSet="", java.lang.String defaultProperty="UI", java.lang.String description="A generic lightweight container.") cons public init() cons public init(boolean) cons public init(java.awt.LayoutManager) @@ -953,13 +1047,17 @@ innr protected AccessibleJPanel intf javax.accessibility.Accessible meth protected java.lang.String paramString() meth public java.lang.String getUIClassID() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=true, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="A string that specifies the name of the L&F class.", java.lang.String[] enumerationValues=[]) meth public javax.accessibility.AccessibleContext getAccessibleContext() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public javax.swing.plaf.PanelUI getUI() meth public void setUI(javax.swing.plaf.PanelUI) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=true, boolean preferred=false, boolean required=false, boolean visualUpdate=true, java.lang.String description="The UI object that implements the Component's LookAndFeel.", java.lang.String[] enumerationValues=[]) meth public void updateUI() supr javax.swing.JComponent CLSS public javax.swing.JTabbedPane + anno 0 java.beans.JavaBean(java.lang.String defaultEventSet="", java.lang.String defaultProperty="UI", java.lang.String description="A component which provides a tab folder metaphor for displaying one component from a set of components.") cons public init() cons public init(int) cons public init(int,int) @@ -982,9 +1080,11 @@ meth public int getDisplayedMnemonicIndexAt(int) meth public int getMnemonicAt(int) meth public int getSelectedIndex() meth public int getTabCount() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public int getTabLayoutPolicy() meth public int getTabPlacement() meth public int getTabRunCount() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public int indexAtLocation(int,int) meth public int indexOfComponent(java.awt.Component) meth public int indexOfTab(java.lang.String) @@ -1003,11 +1103,14 @@ meth public java.lang.String getTitleAt(int) meth public java.lang.String getToolTipText(java.awt.event.MouseEvent) meth public java.lang.String getToolTipTextAt(int) meth public java.lang.String getUIClassID() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public javax.accessibility.AccessibleContext getAccessibleContext() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public javax.swing.Icon getDisabledIconAt(int) meth public javax.swing.Icon getIconAt(int) meth public javax.swing.SingleSelectionModel getModel() meth public javax.swing.event.ChangeListener[] getChangeListeners() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public javax.swing.plaf.TabbedPaneUI getUI() meth public void add(java.awt.Component,java.lang.Object) meth public void add(java.awt.Component,java.lang.Object,int) @@ -1022,22 +1125,38 @@ meth public void removeAll() meth public void removeChangeListener(javax.swing.event.ChangeListener) meth public void removeTabAt(int) meth public void setBackgroundAt(int,java.awt.Color) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The background color at the specified tab index.", java.lang.String[] enumerationValues=[]) meth public void setComponentAt(int,java.awt.Component) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=true, java.lang.String description="The component at the specified tab index.", java.lang.String[] enumerationValues=[]) meth public void setDisabledIconAt(int,javax.swing.Icon) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The disabled icon at the specified tab index.", java.lang.String[] enumerationValues=[]) meth public void setDisplayedMnemonicIndexAt(int,int) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=true, java.lang.String description="the index into the String to draw the keyboard character mnemonic at", java.lang.String[] enumerationValues=[]) meth public void setEnabledAt(int,boolean) meth public void setForegroundAt(int,java.awt.Color) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The foreground color at the specified tab index.", java.lang.String[] enumerationValues=[]) meth public void setIconAt(int,javax.swing.Icon) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The icon at the specified tab index.", java.lang.String[] enumerationValues=[]) meth public void setMnemonicAt(int,int) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=true, java.lang.String description="The keyboard mnenmonic, as a KeyEvent VK constant, for the specified tab", java.lang.String[] enumerationValues=[]) meth public void setModel(javax.swing.SingleSelectionModel) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The tabbedpane's SingleSelectionModel.", java.lang.String[] enumerationValues=[]) meth public void setSelectedComponent(java.awt.Component) + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="The tabbedpane's selected component.", java.lang.String[] enumerationValues=[]) meth public void setSelectedIndex(int) + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="The tabbedpane's selected tab index.", java.lang.String[] enumerationValues=[]) meth public void setTabComponentAt(int,java.awt.Component) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The tab component at the specified tab index.", java.lang.String[] enumerationValues=[]) meth public void setTabLayoutPolicy(int) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The tabbedpane's policy for laying out the tabs", java.lang.String[] enumerationValues=["JTabbedPane.WRAP_TAB_LAYOUT", "JTabbedPane.SCROLL_TAB_LAYOUT"]) meth public void setTabPlacement(int) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The tabbedpane's tab placement.", java.lang.String[] enumerationValues=["JTabbedPane.TOP", "JTabbedPane.LEFT", "JTabbedPane.BOTTOM", "JTabbedPane.RIGHT"]) meth public void setTitleAt(int,java.lang.String) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The title at the specified tab index.", java.lang.String[] enumerationValues=[]) meth public void setToolTipTextAt(int,java.lang.String) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="The tooltip text at the specified tab index.", java.lang.String[] enumerationValues=[]) meth public void setUI(javax.swing.plaf.TabbedPaneUI) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=true, boolean preferred=false, boolean required=false, boolean visualUpdate=true, java.lang.String description="The UI object that implements the tabbedpane's LookAndFeel", java.lang.String[] enumerationValues=[]) meth public void updateUI() supr javax.swing.JComponent @@ -1062,6 +1181,13 @@ fld public final static int TRAILING = 11 fld public final static int VERTICAL = 1 fld public final static int WEST = 7 +CLSS public abstract interface !annotation javax.swing.SwingContainer + anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) + anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) +intf java.lang.annotation.Annotation +meth public abstract !hasdefault boolean value() +meth public abstract !hasdefault java.lang.String delegate() + CLSS public abstract interface javax.swing.event.ListDataListener intf java.util.EventListener meth public abstract void contentsChanged(javax.swing.event.ListDataEvent) @@ -1141,31 +1267,31 @@ meth public boolean isWritable() meth public boolean supportsRestartInDebug() meth public final org.openide.util.RequestProcessor$Task refresh() meth public int getAdminPortNumber() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public int getHttpPortNumber() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.lang.String getAdminPort() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.lang.String getDeployerUri() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.lang.String getDisplayName() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.lang.String getDomainName() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.lang.String getDomainsRoot() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.lang.String getGlassfishRoot() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.lang.String getHostName() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.lang.String getHttpPort() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.lang.String getInstallRoot() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.lang.String getPassword() meth public java.lang.String getResourcesXmlName() meth public java.lang.String getUserName() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.lang.String setEnvironmentProperty(java.lang.String,java.lang.String,boolean) meth public java.util.Map getInstanceProperties() meth public java.util.Map> getApplications(java.lang.String) @@ -1297,7 +1423,7 @@ meth public boolean isRemote() meth public boolean isRemovable() meth public final org.netbeans.modules.glassfish.common.CommonServerSupport getCommonSupport() meth public final org.netbeans.modules.glassfish.spi.GlassfishModule$ServerState getServerState() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public int getAdminPort() meth public int getDebugPort() meth public int getPort() @@ -1515,6 +1641,9 @@ fld public final static org.netbeans.modules.glassfish.common.ServerDetails GLAS fld public final static org.netbeans.modules.glassfish.common.ServerDetails GLASSFISH_SERVER_7_0_4 fld public final static org.netbeans.modules.glassfish.common.ServerDetails GLASSFISH_SERVER_7_0_5 fld public final static org.netbeans.modules.glassfish.common.ServerDetails GLASSFISH_SERVER_7_0_6 +fld public final static org.netbeans.modules.glassfish.common.ServerDetails GLASSFISH_SERVER_7_0_7 +fld public final static org.netbeans.modules.glassfish.common.ServerDetails GLASSFISH_SERVER_7_0_8 +fld public final static org.netbeans.modules.glassfish.common.ServerDetails GLASSFISH_SERVER_7_0_9 meth public boolean isInstalledInDirectory(java.io.File) meth public int getVersion() meth public java.lang.String getDirectUrl() @@ -1528,7 +1657,7 @@ meth public static org.netbeans.modules.glassfish.common.ServerDetails valueOf(j meth public static org.netbeans.modules.glassfish.common.ServerDetails[] values() meth public static org.openide.WizardDescriptor$InstantiatingIterator getInstantiatingIterator() supr java.lang.Enum -hfds directUrl,displayName,indirectUrl,licenseUrl,uriFragment,versionInt +hfds directUrl,displayName,indirectUrl,licenseUrl,serverDetails,uriFragment,versionInt hcls DomainParser CLSS public org.netbeans.modules.glassfish.common.SimpleIO @@ -1828,12 +1957,12 @@ hfds LOGGER CLSS public org.netbeans.modules.glassfish.common.ui.IpComboBox cons public init(boolean) cons public init(java.lang.Object[]) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") cons public init(java.util.Set,boolean) cons public init(java.util.Vector) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") cons public init(javax.swing.ComboBoxModel) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") fld public final static java.lang.String IP_4_127_0_0_1_NAME = "localhost" innr public static InetAddr innr public static InetAddrComparator @@ -1873,11 +2002,11 @@ hfds mailHostField,mailHostLabel,resourceEnabledCB,returnField,returnLabel,userF CLSS public org.netbeans.modules.glassfish.common.ui.JavaPlatformsComboBox cons public init() cons public init(java.lang.Object[]) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") cons public init(java.util.Vector) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") cons public init(javax.swing.ComboBoxModel) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") cons public init(org.netbeans.api.java.platform.JavaPlatform[]) fld public final static java.lang.String EMPTY_DISPLAY_NAME innr public static Platform @@ -1999,7 +2128,7 @@ meth public static boolean isDefaultOrServerTarget(java.util.Map) meth public static java.lang.String escapePath(java.lang.String) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public static java.lang.String quote(java.lang.String) supr java.lang.Object hfds DOMAIN_XML_PATH,INDICATOR,JDK6_DETECTION_FILTER @@ -2328,11 +2457,11 @@ meth protected boolean clearSharedData() meth public boolean closing() meth public void close() meth public void installed() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void restored() meth public void uninstalled() meth public void updated(int,java.lang.String) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void validate() supr org.openide.util.SharedClassObject hfds serialVersionUID @@ -2404,15 +2533,15 @@ meth public java.lang.String toString() meth public javax.swing.Action getPreferredAction() meth public javax.swing.Action[] getActions(boolean) meth public org.openide.util.actions.SystemAction getDefaultAction() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public org.openide.util.actions.SystemAction[] getActions() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public org.openide.util.actions.SystemAction[] getContextActions() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void destroy() throws java.io.IOException meth public void setDisplayName(java.lang.String) meth public void setHidden(boolean) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void setName(java.lang.String) meth public void setShortDescription(java.lang.String) supr java.beans.FeatureDescriptor @@ -2424,10 +2553,10 @@ CLSS public abstract interface static org.openide.nodes.Node$Cookie CLSS public final org.openide.util.HelpCtx cons public init(java.lang.Class) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") cons public init(java.lang.String) cons public init(java.net.URL) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") fld public final static org.openide.util.HelpCtx DEFAULT_HELP innr public abstract interface static Displayer innr public abstract interface static Provider diff --git a/enterprise/glassfish.common/nbproject/project.properties b/enterprise/glassfish.common/nbproject/project.properties index 5a892536fcd4..aa1716097624 100644 --- a/enterprise/glassfish.common/nbproject/project.properties +++ b/enterprise/glassfish.common/nbproject/project.properties @@ -16,7 +16,8 @@ # under the License. javac.compilerargs=-Xlint -Xlint:-serial -javac.source=1.8 +javac.source=11 +javac.target=11 test.config.stableBTD.includes=**/*Test.class test.config.stableBTD.excludes=\ diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties index 7babce535c20..179f5da05449 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties @@ -173,6 +173,9 @@ STR_703_SERVER_NAME=GlassFish Server 7.0.3 STR_704_SERVER_NAME=GlassFish Server 7.0.4 STR_705_SERVER_NAME=GlassFish Server 7.0.5 STR_706_SERVER_NAME=GlassFish Server 7.0.6 +STR_707_SERVER_NAME=GlassFish Server 7.0.7 +STR_708_SERVER_NAME=GlassFish Server 7.0.8 +STR_709_SERVER_NAME=GlassFish Server 7.0.9 # CommonServerSupport.java MSG_FLAKEY_NETWORK=Network communication problem
Could not establish \ diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java index 0d8d14f6eb6d..20bcbbad0524 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java @@ -24,24 +24,7 @@ import java.util.List; import org.netbeans.modules.glassfish.common.parser.TreeParser; import org.netbeans.modules.glassfish.common.wizards.ServerWizardIterator; -import org.netbeans.modules.glassfish.spi.ServerUtilities; -import org.netbeans.modules.glassfish.spi.Utils; import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3_0_1; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3_1; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3_1_1; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3_1_2; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3_1_2_2; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3_1_2_3; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3_1_2_4; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3_1_2_5; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_4; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_4_0_1; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_5; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_5_0_1; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_6; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_6_1_0; import org.netbeans.modules.glassfish.tooling.utils.ServerUtils; import org.openide.WizardDescriptor; import org.openide.util.NbBundle; @@ -58,8 +41,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 3.0/3.0.x */ GLASSFISH_SERVER_3(NbBundle.getMessage(ServerDetails.class,"STR_3_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv3ee6", // NOI18N - 300, + GlassfishInstanceProvider.EE6_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_3, "https://download.oracle.com/glassfish/v3/release/glassfish-v3.zip", // NOI18N "https://download.oracle.com/glassfish/v3/release/glassfish-v3.zip", // NOI18N "https://javaee.github.io/glassfish/LICENSE" //NOI18N @@ -68,8 +51,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 3.0/3.0.x */ GLASSFISH_SERVER_3_0_1(NbBundle.getMessage(ServerDetails.class,"STR_301_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv3ee6", // NOI18N - 301, + GlassfishInstanceProvider.EE6_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_3_0_1, "https://download.oracle.com/glassfish/3.0.1/release/glassfish-3.0.1-ml.zip", // NOI18N "https://download.oracle.com/glassfish/3.0.1/release/glassfish-3.0.1-ml.zip", // NOI18N "https://javaee.github.io/glassfish/LICENSE" //NOI18N @@ -78,8 +61,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 3.1 */ GLASSFISH_SERVER_3_1(NbBundle.getMessage(ServerDetails.class, "STR_31_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv3ee6wc", // NOI18N - 310, + GlassfishInstanceProvider.EE6WC_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_3_1, "https://download.oracle.com/glassfish/3.1/release/glassfish-3.1-ml.zip", // NOI18N "https://download.oracle.com/glassfish/3.1/release/glassfish-3.1-ml.zip", // NOI18N "https://javaee.github.io/glassfish/LICENSE" //NOI18N @@ -88,8 +71,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 3.1.1 */ GLASSFISH_SERVER_3_1_1(NbBundle.getMessage(ServerDetails.class, "STR_311_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv3ee6wc", // NOI18N - 311, + GlassfishInstanceProvider.EE6WC_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_3_1_1, "https://download.oracle.com/glassfish/3.1.1/release/glassfish-3.1.1-ml.zip", // NOI18N "https://download.oracle.com/glassfish/3.1.1/release/glassfish-3.1.1-ml.zip", // NOI18N "https://javaee.github.io/glassfish/LICENSE" //NOI18N @@ -98,8 +81,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 3.1.2 */ GLASSFISH_SERVER_3_1_2(NbBundle.getMessage(ServerDetails.class, "STR_312_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv3ee6wc", // NOI18N - 312, + GlassfishInstanceProvider.EE6WC_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_3_1_2, "https://download.oracle.com/glassfish/3.1.2/release/glassfish-3.1.2-ml.zip", // NOI18N "https://download.oracle.com/glassfish/3.1.2/release/glassfish-3.1.2-ml.zip", // NOI18N "https://javaee.github.io/glassfish/LICENSE" //NOI18N @@ -109,8 +92,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 3.1.2.2 */ GLASSFISH_SERVER_3_1_2_2(NbBundle.getMessage(ServerDetails.class, "STR_3122_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv3ee6wc", // NOI18N - 312, + GlassfishInstanceProvider.EE6WC_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_3_1_2_2, "https://download.oracle.com/glassfish/3.1.2.2/release/glassfish-3.1.2.2-ml.zip", // NOI18N "https://download.oracle.com/glassfish/3.1.2.2/release/glassfish-3.1.2.2-ml.zip", // NOI18N "https://javaee.github.io/glassfish/LICENSE" //NOI18N @@ -120,8 +103,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 4.0.0 */ GLASSFISH_SERVER_4_0(NbBundle.getMessage(ServerDetails.class, "STR_40_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv4ee7", // NOI18N - 400, + GlassfishInstanceProvider.EE7_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_4, "https://download.oracle.com/glassfish/4.0/release/glassfish-4.0-ml.zip", // NOI18N "https://download.oracle.com/glassfish/4.0/release/glassfish-4.0-ml.zip", // NOI18N "https://javaee.github.io/glassfish/LICENSE" //NOI18N @@ -131,8 +114,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 4.0.1 */ GLASSFISH_SERVER_4_0_1(NbBundle.getMessage(ServerDetails.class, "STR_401_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv4ee7", // NOI18N - 401, + GlassfishInstanceProvider.EE7_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_4_0_1, "https://download.oracle.com/glassfish/4.0.1/release/glassfish-4.0.1-ml.zip", // NOI18N "https://download.oracle.com/glassfish/4.0.1/release/glassfish-4.0.1-ml.zip", // NOI18N "https://javaee.github.io/glassfish/LICENSE" //NOI18N" @@ -142,8 +125,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 4.1 */ GLASSFISH_SERVER_4_1(NbBundle.getMessage(ServerDetails.class, "STR_41_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv4ee7", // NOI18N - 410, + GlassfishInstanceProvider.EE7_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_4_1, "https://download.oracle.com/glassfish/4.1/release/glassfish-4.1.zip", // NOI18N "https://download.oracle.com/glassfish/4.1/release/glassfish-4.1.zip", // NOI18N "https://javaee.github.io/glassfish/LICENSE" //NOI18N @@ -153,8 +136,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 4.1.1 */ GLASSFISH_SERVER_4_1_1(NbBundle.getMessage(ServerDetails.class, "STR_411_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv4ee7", // NOI18N - 411, + GlassfishInstanceProvider.EE7_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_4_1_1, "https://download.oracle.com/glassfish/4.1.1/release/glassfish-4.1.1.zip", // NOI18N "https://download.oracle.com/glassfish/4.1.1/release/glassfish-4.1.1.zip", // NOI18N "https://javaee.github.io/glassfish/LICENSE" //NOI18N @@ -164,8 +147,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 4.1.2 */ GLASSFISH_SERVER_4_1_2(NbBundle.getMessage(ServerDetails.class, "STR_412_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv4ee7", // NOI18N - 412, + GlassfishInstanceProvider.EE7_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_4_1_2, "https://download.oracle.com/glassfish/4.1.2/release/glassfish-4.1.2.zip", // NOI18N "https://download.oracle.com/glassfish/4.1.2/release/glassfish-4.1.2.zip", // NOI18N "https://javaee.github.io/glassfish/LICENSE" //NOI18N @@ -175,8 +158,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 5 */ GLASSFISH_SERVER_5_0(NbBundle.getMessage(ServerDetails.class, "STR_50_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv5ee8", // NOI18N - 500, + GlassfishInstanceProvider.EE8_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_5, "https://download.oracle.com/glassfish/5.0/release/glassfish-5.0.zip", // NOI18N "https://download.oracle.com/glassfish/5.0/release/glassfish-5.0.zip", // NOI18N "https://javaee.github.io/glassfish/LICENSE" //NOI18N @@ -186,8 +169,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 5.0.1 */ GLASSFISH_SERVER_5_0_1(NbBundle.getMessage(ServerDetails.class, "STR_501_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv5ee8", // NOI18N - 501, + GlassfishInstanceProvider.EE8_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_5_0_1, "https://download.oracle.com/glassfish/5.0.1/release/glassfish-5.0.1.zip", // NOI18N "https://download.oracle.com/glassfish/5.0.1/release/glassfish-5.0.1.zip", // NOI18N "https://javaee.github.io/glassfish/LICENSE" //NOI18N @@ -197,8 +180,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 5.1.0 */ GLASSFISH_SERVER_5_1_0(NbBundle.getMessage(ServerDetails.class, "STR_510_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv510ee8", // NOI18N - 510, + GlassfishInstanceProvider.JAKARTAEE8_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_5_1_0, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/5.1.0/glassfish-5.1.0.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/5.1.0/glassfish-5.1.0.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -208,8 +191,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 6.0.0 */ GLASSFISH_SERVER_6(NbBundle.getMessage(ServerDetails.class, "STR_6_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv6ee9", // NOI18N - 600, + GlassfishInstanceProvider.JAKARTAEE9_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_6, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.0.0/glassfish-6.0.0.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.0.0/glassfish-6.0.0.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -219,8 +202,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 6.1.0 */ GLASSFISH_SERVER_6_1_0(NbBundle.getMessage(ServerDetails.class, "STR_610_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv610ee9", // NOI18N - 610, + GlassfishInstanceProvider.JAKARTAEE91_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_6_1_0, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.1.0/glassfish-6.1.0.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.1.0/glassfish-6.1.0.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -230,8 +213,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 6.2.0 */ GLASSFISH_SERVER_6_2_0(NbBundle.getMessage(ServerDetails.class, "STR_620_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv610ee9", // NOI18N - 620, + GlassfishInstanceProvider.JAKARTAEE91_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_6_2_0, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.0/glassfish-6.2.0.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.0/glassfish-6.2.0.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -241,8 +224,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 6.2.1 */ GLASSFISH_SERVER_6_2_1(NbBundle.getMessage(ServerDetails.class, "STR_621_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv610ee9", // NOI18N - 621, + GlassfishInstanceProvider.JAKARTAEE91_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_6_2_1, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.1/glassfish-6.2.1.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.1/glassfish-6.2.1.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -252,8 +235,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 6.2.2 */ GLASSFISH_SERVER_6_2_2(NbBundle.getMessage(ServerDetails.class, "STR_622_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv610ee9", // NOI18N - 622, + GlassfishInstanceProvider.JAKARTAEE91_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_6_2_2, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.2/glassfish-6.2.2.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.2/glassfish-6.2.2.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -263,8 +246,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 6.2.3 */ GLASSFISH_SERVER_6_2_3(NbBundle.getMessage(ServerDetails.class, "STR_623_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv610ee9", // NOI18N - 623, + GlassfishInstanceProvider.JAKARTAEE91_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_6_2_3, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.3/glassfish-6.2.3.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.3/glassfish-6.2.3.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -274,8 +257,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 6.2.4 */ GLASSFISH_SERVER_6_2_4(NbBundle.getMessage(ServerDetails.class, "STR_624_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv610ee9", // NOI18N - 624, + GlassfishInstanceProvider.JAKARTAEE91_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_6_2_4, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.4/glassfish-6.2.4.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.4/glassfish-6.2.4.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -285,8 +268,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 6.2.5 */ GLASSFISH_SERVER_6_2_5(NbBundle.getMessage(ServerDetails.class, "STR_625_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv610ee9", // NOI18N - 625, + GlassfishInstanceProvider.JAKARTAEE91_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_6_2_5, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.5/glassfish-6.2.5.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.2.5/glassfish-6.2.5.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -296,8 +279,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 7.0.0 */ GLASSFISH_SERVER_7_0_0(NbBundle.getMessage(ServerDetails.class, "STR_700_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv700ee10", // NOI18N - 700, + GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_7_0_0, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.0/glassfish-7.0.0.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.0/glassfish-7.0.0.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -307,8 +290,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 7.0.1 */ GLASSFISH_SERVER_7_0_1(NbBundle.getMessage(ServerDetails.class, "STR_701_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv700ee10", // NOI18N - 701, + GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_7_0_1, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.1/glassfish-7.0.1.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.1/glassfish-7.0.1.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -318,8 +301,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 7.0.2 */ GLASSFISH_SERVER_7_0_2(NbBundle.getMessage(ServerDetails.class, "STR_702_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv700ee10", // NOI18N - 702, + GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_7_0_2, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.2/glassfish-7.0.2.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.2/glassfish-7.0.2.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -329,8 +312,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 7.0.3 */ GLASSFISH_SERVER_7_0_3(NbBundle.getMessage(ServerDetails.class, "STR_703_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv700ee10", // NOI18N - 703, + GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_7_0_3, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.3/glassfish-7.0.3.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.3/glassfish-7.0.3.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -340,8 +323,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 7.0.4 */ GLASSFISH_SERVER_7_0_4(NbBundle.getMessage(ServerDetails.class, "STR_704_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv700ee10", // NOI18N - 704, + GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_7_0_4, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.4/glassfish-7.0.4.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.4/glassfish-7.0.4.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -351,8 +334,8 @@ public enum ServerDetails { * details for an instance of GlassFish Server 7.0.5 */ GLASSFISH_SERVER_7_0_5(NbBundle.getMessage(ServerDetails.class, "STR_705_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv700ee10", // NOI18N - 705, + GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_7_0_5, "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.5/glassfish-7.0.5.zip", // NOI18N "https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.5/glassfish-7.0.5.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N @@ -362,12 +345,50 @@ public enum ServerDetails { * details for an instance of GlassFish Server 7.0.6 */ GLASSFISH_SERVER_7_0_6(NbBundle.getMessage(ServerDetails.class, "STR_706_SERVER_NAME", new Object[]{}), // NOI18N - "deployer:gfv700ee10", // NOI18N - 706, + GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_7_0_6, "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 + GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_7_0_7, + "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 + GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_7_0_8, + "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 + GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_7_0_9, + "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 = ServerDetails.values(); /** * Creates an iterator for a wizard to instantiate server objects. @@ -377,60 +398,7 @@ public enum ServerDetails { */ public static WizardDescriptor.InstantiatingIterator getInstantiatingIterator() { - return new ServerWizardIterator(new ServerDetails[]{ - GLASSFISH_SERVER_7_0_6, - GLASSFISH_SERVER_7_0_5, - GLASSFISH_SERVER_7_0_4, - GLASSFISH_SERVER_7_0_3, - GLASSFISH_SERVER_7_0_2, - GLASSFISH_SERVER_7_0_1, - GLASSFISH_SERVER_7_0_0, - GLASSFISH_SERVER_6_2_5, - GLASSFISH_SERVER_6_2_4, - GLASSFISH_SERVER_6_2_3, - GLASSFISH_SERVER_6_2_2, - GLASSFISH_SERVER_6_2_1, - GLASSFISH_SERVER_6_2_0, - GLASSFISH_SERVER_6_1_0, - GLASSFISH_SERVER_6, - GLASSFISH_SERVER_5_1_0, - GLASSFISH_SERVER_5_0_1, - GLASSFISH_SERVER_5_0, - GLASSFISH_SERVER_4_1_2, - GLASSFISH_SERVER_4_1_1, - GLASSFISH_SERVER_4_1, - GLASSFISH_SERVER_4_0_1, - GLASSFISH_SERVER_4_0, - GLASSFISH_SERVER_3_1_2_2, - GLASSFISH_SERVER_3_1_2, - GLASSFISH_SERVER_3_1_1, - GLASSFISH_SERVER_3_1, - GLASSFISH_SERVER_3_0_1, - GLASSFISH_SERVER_3}, - new ServerDetails[]{ - GLASSFISH_SERVER_7_0_6, - GLASSFISH_SERVER_7_0_5, - GLASSFISH_SERVER_7_0_4, - GLASSFISH_SERVER_7_0_3, - GLASSFISH_SERVER_7_0_2, - GLASSFISH_SERVER_7_0_1, - GLASSFISH_SERVER_7_0_0, - GLASSFISH_SERVER_6_2_5, - GLASSFISH_SERVER_6_2_4, - GLASSFISH_SERVER_6_2_3, - GLASSFISH_SERVER_6_2_2, - GLASSFISH_SERVER_6_2_1, - GLASSFISH_SERVER_6_2_0, - GLASSFISH_SERVER_6_1_0, - GLASSFISH_SERVER_6, - GLASSFISH_SERVER_5_1_0, - GLASSFISH_SERVER_5_0_1, - GLASSFISH_SERVER_5_0, - GLASSFISH_SERVER_4_1_2, - GLASSFISH_SERVER_4_1_1, - GLASSFISH_SERVER_4_1, - GLASSFISH_SERVER_4_0, - GLASSFISH_SERVER_3_1_2_2}); + return new ServerWizardIterator(serverDetails, serverDetails); } /** @@ -445,45 +413,10 @@ public static int getVersionFromInstallDirectory(File glassfishDir) { GlassFishVersion version = ServerUtils.getServerVersion(glassfishDir.getAbsolutePath()); - ServerDetails sd = null; if (version != null) { - switch(version) { - case GF_3: return GLASSFISH_SERVER_3.getVersion(); - case GF_3_0_1: return GLASSFISH_SERVER_3_0_1.getVersion(); - case GF_3_1: return GLASSFISH_SERVER_3_1.getVersion(); - case GF_3_1_1: return GLASSFISH_SERVER_3_1_1.getVersion(); - case GF_3_1_2: return GLASSFISH_SERVER_3_1_2.getVersion(); - case GF_3_1_2_2: - case GF_3_1_2_3: - case GF_3_1_2_4: - case GF_3_1_2_5: return GLASSFISH_SERVER_3_1_2_2.getVersion(); - case GF_4: return GLASSFISH_SERVER_4_0.getVersion(); - case GF_4_0_1: return GLASSFISH_SERVER_4_0_1.getVersion(); - case GF_4_1: return GLASSFISH_SERVER_4_1.getVersion(); - case GF_4_1_1: return GLASSFISH_SERVER_4_1_1.getVersion(); - case GF_4_1_2: return GLASSFISH_SERVER_4_1_2.getVersion(); - case GF_5: return GLASSFISH_SERVER_5_0.getVersion(); - case GF_5_0_1: return GLASSFISH_SERVER_5_0_1.getVersion(); - case GF_5_1_0: return GLASSFISH_SERVER_5_1_0.getVersion(); - case GF_6: return GLASSFISH_SERVER_6.getVersion(); - case GF_6_1_0: return GLASSFISH_SERVER_6_1_0.getVersion(); - case GF_6_2_0: return GLASSFISH_SERVER_6_2_0.getVersion(); - case GF_6_2_1: return GLASSFISH_SERVER_6_2_1.getVersion(); - case GF_6_2_2: return GLASSFISH_SERVER_6_2_2.getVersion(); - case GF_6_2_3: return GLASSFISH_SERVER_6_2_3.getVersion(); - case GF_6_2_4: return GLASSFISH_SERVER_6_2_4.getVersion(); - case GF_6_2_5: return GLASSFISH_SERVER_6_2_5.getVersion(); - case GF_7_0_0: return GLASSFISH_SERVER_7_0_0.getVersion(); - case GF_7_0_1: return GLASSFISH_SERVER_7_0_1.getVersion(); - case GF_7_0_2: return GLASSFISH_SERVER_7_0_2.getVersion(); - case GF_7_0_3: return GLASSFISH_SERVER_7_0_3.getVersion(); - 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(); - default: return -1; - } + return version.toFullInteger(); } - return null==sd?-1:sd.getVersion(); + return -1; } /** @@ -508,22 +441,22 @@ private static boolean hasDefaultConfig(File domainXml) throws IllegalStateExcep TreeParser.readXml(domainXml, paths); return dp.hasDefaultConfig(); } + + private final String displayName; + private final String uriFragment; + private final String indirectUrl; + private final String directUrl; + private final String licenseUrl; + private final GlassFishVersion glassFishVersion; - private String displayName; - private String uriFragment; - private String indirectUrl; - private String directUrl; - private String licenseUrl; - private int versionInt; - - - ServerDetails(String displayName, String uriFragment, int versionInt, + + ServerDetails(String displayName, String uriFragment, GlassFishVersion glassFishVersion, String directUrl, String indirectUrl, String licenseUrl) { this.displayName = displayName; this.uriFragment = uriFragment; this.indirectUrl = indirectUrl; this.directUrl = directUrl; - this.versionInt = versionInt; + this.glassFishVersion = glassFishVersion; this.licenseUrl = licenseUrl; } @@ -537,7 +470,7 @@ public String getUriFragment() { } public int getVersion() { - return versionInt; + return glassFishVersion.toFullInteger(); } /** diff --git a/enterprise/glassfish.eecommon/nbproject/org-netbeans-modules-glassfish-eecommon.sig b/enterprise/glassfish.eecommon/nbproject/org-netbeans-modules-glassfish-eecommon.sig index 7065d194efd4..3f8581542beb 100644 --- a/enterprise/glassfish.eecommon/nbproject/org-netbeans-modules-glassfish-eecommon.sig +++ b/enterprise/glassfish.eecommon/nbproject/org-netbeans-modules-glassfish-eecommon.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 1.58.0 +#Version 1.59.0 CLSS public abstract java.awt.Component cons protected init() @@ -17,6 +17,7 @@ intf java.awt.MenuContainer intf java.awt.image.ImageObserver intf java.io.Serializable meth protected boolean requestFocus(boolean) +meth protected boolean requestFocus(boolean,java.awt.event.FocusEvent$Cause) meth protected boolean requestFocusInWindow(boolean) meth protected final void disableEvents(long) meth protected final void enableEvents(long) @@ -37,20 +38,20 @@ meth protected void processMouseMotionEvent(java.awt.event.MouseEvent) meth protected void processMouseWheelEvent(java.awt.event.MouseWheelEvent) meth public <%0 extends java.util.EventListener> {%%0}[] getListeners(java.lang.Class<{%%0}>) meth public boolean action(java.awt.Event,java.lang.Object) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean areFocusTraversalKeysSet(int) meth public boolean contains(int,int) meth public boolean contains(java.awt.Point) meth public boolean getFocusTraversalKeysEnabled() meth public boolean getIgnoreRepaint() meth public boolean gotFocus(java.awt.Event,java.lang.Object) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean handleEvent(java.awt.Event) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean hasFocus() meth public boolean imageUpdate(java.awt.Image,int,int,int,int,int) meth public boolean inside(int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean isBackgroundSet() meth public boolean isCursorSet() meth public boolean isDisplayable() @@ -59,7 +60,7 @@ meth public boolean isEnabled() meth public boolean isFocusCycleRoot(java.awt.Container) meth public boolean isFocusOwner() meth public boolean isFocusTraversable() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean isFocusable() meth public boolean isFontSet() meth public boolean isForegroundSet() @@ -72,28 +73,29 @@ meth public boolean isShowing() meth public boolean isValid() meth public boolean isVisible() meth public boolean keyDown(java.awt.Event,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean keyUp(java.awt.Event,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean lostFocus(java.awt.Event,java.lang.Object) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean mouseDown(java.awt.Event,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean mouseDrag(java.awt.Event,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean mouseEnter(java.awt.Event,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean mouseExit(java.awt.Event,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean mouseMove(java.awt.Event,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean mouseUp(java.awt.Event,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean postEvent(java.awt.Event) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean prepareImage(java.awt.Image,int,int,java.awt.image.ImageObserver) meth public boolean prepareImage(java.awt.Image,java.awt.image.ImageObserver) meth public boolean requestFocusInWindow() +meth public boolean requestFocusInWindow(java.awt.event.FocusEvent$Cause) meth public final java.lang.Object getTreeLock() meth public final void dispatchEvent(java.awt.AWTEvent) meth public float getAlignmentX() @@ -110,7 +112,7 @@ meth public java.awt.Color getForeground() meth public java.awt.Component getComponentAt(int,int) meth public java.awt.Component getComponentAt(java.awt.Point) meth public java.awt.Component locate(int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Component$BaselineResizeBehavior getBaselineResizeBehavior() meth public java.awt.ComponentOrientation getComponentOrientation() meth public java.awt.Container getFocusCycleRootAncestor() @@ -122,11 +124,11 @@ meth public java.awt.Dimension getPreferredSize() meth public java.awt.Dimension getSize() meth public java.awt.Dimension getSize(java.awt.Dimension) meth public java.awt.Dimension minimumSize() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Dimension preferredSize() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Dimension size() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Font getFont() meth public java.awt.FontMetrics getFontMetrics(java.awt.Font) meth public java.awt.Graphics getGraphics() @@ -138,9 +140,9 @@ meth public java.awt.Point getLocation(java.awt.Point) meth public java.awt.Point getLocationOnScreen() meth public java.awt.Point getMousePosition() meth public java.awt.Point location() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Rectangle bounds() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Rectangle getBounds() meth public java.awt.Rectangle getBounds(java.awt.Rectangle) meth public java.awt.Toolkit getToolkit() @@ -181,14 +183,14 @@ meth public void addPropertyChangeListener(java.beans.PropertyChangeListener) meth public void addPropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener) meth public void applyComponentOrientation(java.awt.ComponentOrientation) meth public void deliverEvent(java.awt.Event) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void disable() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void doLayout() meth public void enable() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void enable(boolean) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void enableInputMethods(boolean) meth public void firePropertyChange(java.lang.String,byte,byte) meth public void firePropertyChange(java.lang.String,char,char) @@ -197,19 +199,19 @@ meth public void firePropertyChange(java.lang.String,float,float) meth public void firePropertyChange(java.lang.String,long,long) meth public void firePropertyChange(java.lang.String,short,short) meth public void hide() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void invalidate() meth public void layout() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void list() meth public void list(java.io.PrintStream) meth public void list(java.io.PrintStream,int) meth public void list(java.io.PrintWriter) meth public void list(java.io.PrintWriter,int) meth public void move(int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void nextFocus() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void paint(java.awt.Graphics) meth public void paintAll(java.awt.Graphics) meth public void print(java.awt.Graphics) @@ -232,12 +234,13 @@ meth public void repaint(int,int,int,int) meth public void repaint(long) meth public void repaint(long,int,int,int,int) meth public void requestFocus() +meth public void requestFocus(java.awt.event.FocusEvent$Cause) meth public void reshape(int,int,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void resize(int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void resize(java.awt.Dimension) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void revalidate() meth public void setBackground(java.awt.Color) meth public void setBounds(int,int,int,int) @@ -257,15 +260,16 @@ meth public void setLocation(int,int) meth public void setLocation(java.awt.Point) meth public void setMaximumSize(java.awt.Dimension) meth public void setMinimumSize(java.awt.Dimension) +meth public void setMixingCutoutShape(java.awt.Shape) meth public void setName(java.lang.String) meth public void setPreferredSize(java.awt.Dimension) meth public void setSize(int,int) meth public void setSize(java.awt.Dimension) meth public void setVisible(boolean) meth public void show() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void show(boolean) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void transferFocus() meth public void transferFocusBackward() meth public void transferFocusUpCycle() @@ -293,7 +297,7 @@ meth public final void setFocusTraversalPolicyProvider(boolean) meth public float getAlignmentX() meth public float getAlignmentY() meth public int countComponents() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public int getComponentCount() meth public int getComponentZOrder(java.awt.Component) meth public java.awt.Component add(java.awt.Component) @@ -305,19 +309,19 @@ meth public java.awt.Component getComponent(int) meth public java.awt.Component getComponentAt(int,int) meth public java.awt.Component getComponentAt(java.awt.Point) meth public java.awt.Component locate(int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Component[] getComponents() meth public java.awt.Dimension getMaximumSize() meth public java.awt.Dimension getMinimumSize() meth public java.awt.Dimension getPreferredSize() meth public java.awt.Dimension minimumSize() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Dimension preferredSize() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.FocusTraversalPolicy getFocusTraversalPolicy() meth public java.awt.Insets getInsets() meth public java.awt.Insets insets() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.LayoutManager getLayout() meth public java.awt.Point getMousePosition(boolean) meth public java.awt.event.ContainerListener[] getContainerListeners() @@ -330,11 +334,11 @@ meth public void addPropertyChangeListener(java.beans.PropertyChangeListener) meth public void addPropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener) meth public void applyComponentOrientation(java.awt.ComponentOrientation) meth public void deliverEvent(java.awt.Event) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void doLayout() meth public void invalidate() meth public void layout() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void list(java.io.PrintStream,int) meth public void list(java.io.PrintWriter,int) meth public void paint(java.awt.Graphics) @@ -359,7 +363,7 @@ supr java.awt.Component CLSS public abstract interface java.awt.MenuContainer meth public abstract boolean postEvent(java.awt.Event) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public abstract java.awt.Font getFont() meth public abstract void remove(java.awt.MenuComponent) @@ -374,6 +378,15 @@ fld public final static int SOMEBITS = 8 fld public final static int WIDTH = 1 meth public abstract boolean imageUpdate(java.awt.Image,int,int,int,int,int) +CLSS public abstract interface !annotation java.beans.JavaBean + anno 0 java.lang.annotation.Documented() + anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME) + anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE]) +intf java.lang.annotation.Annotation +meth public abstract !hasdefault java.lang.String defaultEventSet() +meth public abstract !hasdefault java.lang.String defaultProperty() +meth public abstract !hasdefault java.lang.String description() + CLSS public abstract interface java.beans.PropertyChangeListener intf java.util.EventListener meth public abstract void propertyChange(java.beans.PropertyChangeEvent) @@ -418,6 +431,7 @@ CLSS public java.lang.Object cons public init() meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException meth protected void finalize() throws java.lang.Throwable + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="9") meth public boolean equals(java.lang.Object) meth public final java.lang.Class getClass() meth public final void notify() @@ -440,6 +454,7 @@ cons public init(java.lang.String) cons public init(java.lang.ThreadGroup,java.lang.Runnable) cons public init(java.lang.ThreadGroup,java.lang.Runnable,java.lang.String) cons public init(java.lang.ThreadGroup,java.lang.Runnable,java.lang.String,long) +cons public init(java.lang.ThreadGroup,java.lang.Runnable,java.lang.String,long,boolean) cons public init(java.lang.ThreadGroup,java.lang.String) fld public final static int MAX_PRIORITY = 10 fld public final static int MIN_PRIORITY = 1 @@ -459,18 +474,16 @@ meth public final void join() throws java.lang.InterruptedException meth public final void join(long) throws java.lang.InterruptedException meth public final void join(long,int) throws java.lang.InterruptedException meth public final void resume() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="1.2") meth public final void setDaemon(boolean) meth public final void setName(java.lang.String) meth public final void setPriority(int) meth public final void stop() - anno 0 java.lang.Deprecated() -meth public final void stop(java.lang.Throwable) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="1.2") meth public final void suspend() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="1.2") meth public int countStackFrames() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=true, java.lang.String since="1.2") meth public java.lang.ClassLoader getContextClassLoader() meth public java.lang.StackTraceElement[] getStackTrace() meth public java.lang.String toString() @@ -485,12 +498,11 @@ meth public static java.lang.Thread currentThread() meth public static java.lang.Thread$UncaughtExceptionHandler getDefaultUncaughtExceptionHandler() meth public static java.util.Map getAllStackTraces() meth public static void dumpStack() +meth public static void onSpinWait() meth public static void setDefaultUncaughtExceptionHandler(java.lang.Thread$UncaughtExceptionHandler) meth public static void sleep(long) throws java.lang.InterruptedException meth public static void sleep(long,int) throws java.lang.InterruptedException meth public static void yield() -meth public void destroy() - anno 0 java.lang.Deprecated() meth public void interrupt() meth public void run() meth public void setContextClassLoader(java.lang.ClassLoader) @@ -530,6 +542,7 @@ CLSS public abstract interface javax.accessibility.Accessible meth public abstract javax.accessibility.AccessibleContext getAccessibleContext() CLSS public abstract javax.swing.JComponent + anno 0 java.beans.JavaBean(java.lang.String defaultEventSet="", java.lang.String defaultProperty="UIClassID", java.lang.String description="") cons public init() fld protected javax.swing.event.EventListenerList listenerList fld protected javax.swing.plaf.ComponentUI ui @@ -557,6 +570,7 @@ meth protected void processKeyEvent(java.awt.event.KeyEvent) meth protected void processMouseEvent(java.awt.event.MouseEvent) meth protected void processMouseMotionEvent(java.awt.event.MouseEvent) meth protected void setUI(javax.swing.plaf.ComponentUI) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=true, boolean preferred=false, boolean required=false, boolean visualUpdate=true, java.lang.String description="The component's look and feel delegate.", java.lang.String[] enumerationValues=[]) meth public <%0 extends java.util.EventListener> {%%0}[] getListeners(java.lang.Class<{%%0}>) meth public boolean contains(int,int) meth public boolean getAutoscrolls() @@ -564,17 +578,21 @@ meth public boolean getInheritsPopupMenu() meth public boolean getVerifyInputWhenFocusTarget() meth public boolean isDoubleBuffered() meth public boolean isManagingFocus() - anno 0 java.lang.Deprecated() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean isOpaque() meth public boolean isOptimizedDrawingEnabled() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public boolean isPaintingTile() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public boolean isRequestFocusEnabled() meth public boolean isValidateRoot() meth public boolean requestDefaultFocus() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean requestFocus(boolean) meth public boolean requestFocusInWindow() meth public final boolean isPaintingForPrint() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public final java.lang.Object getClientProperty(java.lang.Object) meth public final javax.swing.ActionMap getActionMap() meth public final javax.swing.InputMap getInputMap() @@ -588,39 +606,54 @@ meth public int getBaseline(int,int) meth public int getConditionForKeyStroke(javax.swing.KeyStroke) meth public int getDebugGraphicsOptions() meth public int getHeight() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public int getWidth() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public int getX() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public int getY() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.awt.Component getNextFocusableComponent() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public java.awt.Component$BaselineResizeBehavior getBaselineResizeBehavior() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.awt.Container getTopLevelAncestor() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.awt.Dimension getMaximumSize() meth public java.awt.Dimension getMinimumSize() meth public java.awt.Dimension getPreferredSize() meth public java.awt.Dimension getSize(java.awt.Dimension) meth public java.awt.FontMetrics getFontMetrics(java.awt.Font) meth public java.awt.Graphics getGraphics() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.awt.Insets getInsets() + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=true, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.awt.Insets getInsets(java.awt.Insets) meth public java.awt.Point getLocation(java.awt.Point) meth public java.awt.Point getPopupLocation(java.awt.event.MouseEvent) meth public java.awt.Point getToolTipLocation(java.awt.event.MouseEvent) meth public java.awt.Rectangle getBounds(java.awt.Rectangle) meth public java.awt.Rectangle getVisibleRect() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.awt.event.ActionListener getActionForKeyStroke(javax.swing.KeyStroke) meth public java.beans.VetoableChangeListener[] getVetoableChangeListeners() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public java.lang.String getToolTipText() meth public java.lang.String getToolTipText(java.awt.event.MouseEvent) meth public java.lang.String getUIClassID() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=true, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="UIClassID", java.lang.String[] enumerationValues=[]) meth public javax.swing.InputVerifier getInputVerifier() meth public javax.swing.JPopupMenu getComponentPopupMenu() meth public javax.swing.JRootPane getRootPane() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public javax.swing.JToolTip createToolTip() meth public javax.swing.KeyStroke[] getRegisteredKeyStrokes() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public javax.swing.TransferHandler getTransferHandler() meth public javax.swing.border.Border getBorder() meth public javax.swing.event.AncestorListener[] getAncestorListeners() + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="", java.lang.String[] enumerationValues=[]) +meth public javax.swing.plaf.ComponentUI getUI() meth public static boolean isLightweightComponent(java.awt.Component) meth public static java.util.Locale getDefaultLocale() meth public static void setDefaultLocale(java.util.Locale) @@ -629,15 +662,15 @@ meth public void addNotify() meth public void addVetoableChangeListener(java.beans.VetoableChangeListener) meth public void computeVisibleRect(java.awt.Rectangle) meth public void disable() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void enable() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void firePropertyChange(java.lang.String,boolean,boolean) meth public void firePropertyChange(java.lang.String,char,char) meth public void firePropertyChange(java.lang.String,int,int) meth public void grabFocus() meth public void hide() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void paint(java.awt.Graphics) meth public void paintImmediately(int,int,int,int) meth public void paintImmediately(java.awt.Rectangle) @@ -653,34 +686,54 @@ meth public void repaint(long,int,int,int,int) meth public void requestFocus() meth public void resetKeyboardActions() meth public void reshape(int,int,int,int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void revalidate() meth public void scrollRectToVisible(java.awt.Rectangle) meth public void setAlignmentX(float) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The preferred horizontal alignment of the component.", java.lang.String[] enumerationValues=[]) meth public void setAlignmentY(float) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The preferred vertical alignment of the component.", java.lang.String[] enumerationValues=[]) meth public void setAutoscrolls(boolean) + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=true, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="Determines if this component automatically scrolls its contents when dragged.", java.lang.String[] enumerationValues=[]) meth public void setBackground(java.awt.Color) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The background color of the component.", java.lang.String[] enumerationValues=[]) meth public void setBorder(javax.swing.border.Border) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The component's border.", java.lang.String[] enumerationValues=[]) meth public void setComponentPopupMenu(javax.swing.JPopupMenu) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="Popup to show", java.lang.String[] enumerationValues=[]) meth public void setDebugGraphicsOptions(int) + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="Diagnostic options for graphics operations.", java.lang.String[] enumerationValues=["DebugGraphics.NONE_OPTION", "DebugGraphics.LOG_OPTION", "DebugGraphics.FLASH_OPTION", "DebugGraphics.BUFFERED_OPTION"]) meth public void setDoubleBuffered(boolean) meth public void setEnabled(boolean) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=true, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The enabled state of the component.", java.lang.String[] enumerationValues=[]) meth public void setFocusTraversalKeys(int,java.util.Set) meth public void setFont(java.awt.Font) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The font for the component.", java.lang.String[] enumerationValues=[]) meth public void setForeground(java.awt.Color) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=true, java.lang.String description="The foreground color of the component.", java.lang.String[] enumerationValues=[]) meth public void setInheritsPopupMenu(boolean) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="Whether or not the JPopupMenu is inherited", java.lang.String[] enumerationValues=[]) meth public void setInputVerifier(javax.swing.InputVerifier) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The component's input verifier.", java.lang.String[] enumerationValues=[]) meth public void setMaximumSize(java.awt.Dimension) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The maximum size of the component.", java.lang.String[] enumerationValues=[]) meth public void setMinimumSize(java.awt.Dimension) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The minimum size of the component.", java.lang.String[] enumerationValues=[]) meth public void setNextFocusableComponent(java.awt.Component) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void setOpaque(boolean) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=true, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="The component's opacity", java.lang.String[] enumerationValues=[]) meth public void setPreferredSize(java.awt.Dimension) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="The preferred size of the component.", java.lang.String[] enumerationValues=[]) meth public void setRequestFocusEnabled(boolean) meth public void setToolTipText(java.lang.String) + anno 0 java.beans.BeanProperty(boolean bound=false, boolean expert=false, boolean hidden=false, boolean preferred=true, boolean required=false, boolean visualUpdate=false, java.lang.String description="The text to display in a tool tip.", java.lang.String[] enumerationValues=[]) meth public void setTransferHandler(javax.swing.TransferHandler) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=true, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="Mechanism for transfer of data to and from the component", java.lang.String[] enumerationValues=[]) meth public void setVerifyInputWhenFocusTarget(boolean) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=false, boolean preferred=false, boolean required=false, boolean visualUpdate=false, java.lang.String description="Whether the Component verifies input before accepting focus.", java.lang.String[] enumerationValues=[]) meth public void setVisible(boolean) + anno 0 java.beans.BeanProperty(boolean bound=true, boolean expert=false, boolean hidden=true, boolean preferred=false, boolean required=false, boolean visualUpdate=true, java.lang.String description="", java.lang.String[] enumerationValues=[]) meth public void unregisterKeyboardAction(javax.swing.KeyStroke) meth public void update(java.awt.Graphics) meth public void updateUI() @@ -1110,7 +1163,7 @@ CLSS public abstract org.netbeans.modules.glassfish.eecommon.api.config.Glassfis cons protected init(org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule,org.netbeans.modules.glassfish.eecommon.api.config.J2eeModuleHelper,org.netbeans.modules.glassfish.tooling.data.GlassFishVersion) throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException cons protected init(org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule,org.netbeans.modules.glassfish.tooling.data.GlassFishVersion) throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException cons public init() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") fld protected final java.io.File primarySunDD fld protected final java.io.File secondarySunDD fld protected final org.netbeans.modules.glassfish.eecommon.api.config.J2eeModuleHelper moduleHelper @@ -1333,11 +1386,11 @@ CLSS public abstract org.openide.filesystems.FileSystem cons public init() fld public final static java.lang.String PROP_DISPLAY_NAME = "displayName" fld public final static java.lang.String PROP_HIDDEN = "hidden" - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") fld public final static java.lang.String PROP_READ_ONLY = "readOnly" fld public final static java.lang.String PROP_ROOT = "root" fld public final static java.lang.String PROP_SYSTEM_NAME = "systemName" - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") fld public final static java.lang.String PROP_VALID = "valid" innr public abstract interface static AtomicAction intf java.io.Serializable @@ -1345,7 +1398,7 @@ meth protected final void fireFileStatusChanged(org.openide.filesystems.FileStat meth protected final void firePropertyChange(java.lang.String,java.lang.Object,java.lang.Object) meth protected final void fireVetoableChange(java.lang.String,java.lang.Object,java.lang.Object) throws java.beans.PropertyVetoException meth protected final void setSystemName(java.lang.String) throws java.beans.PropertyVetoException - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public abstract boolean isReadOnly() meth public abstract java.lang.String getDisplayName() meth public abstract org.openide.filesystems.FileObject findResource(java.lang.String) @@ -1353,7 +1406,7 @@ meth public abstract org.openide.filesystems.FileObject getRoot() meth public final boolean isDefault() meth public final boolean isValid() meth public final java.lang.String getSystemName() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public final void addFileChangeListener(org.openide.filesystems.FileChangeListener) meth public final void addFileStatusListener(org.openide.filesystems.FileStatusListener) meth public final void addPropertyChangeListener(java.beans.PropertyChangeListener) @@ -1366,7 +1419,7 @@ meth public final void runAtomicAction(org.openide.filesystems.FileSystem$Atomic meth public java.lang.String toString() meth public org.openide.filesystems.FileObject createTempFile(org.openide.filesystems.FileObject,java.lang.String,java.lang.String,boolean) throws java.io.IOException meth public org.openide.filesystems.FileObject find(java.lang.String,java.lang.String,java.lang.String) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public org.openide.filesystems.FileObject getTempFolder() throws java.io.IOException meth public org.openide.filesystems.StatusDecorator getDecorator() meth public org.openide.util.Lookup findExtrasFor(java.util.Set) @@ -1383,10 +1436,10 @@ meth public abstract void run() throws java.io.IOException CLSS public final org.openide.util.HelpCtx cons public init(java.lang.Class) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") cons public init(java.lang.String) cons public init(java.net.URL) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") fld public final static org.openide.util.HelpCtx DEFAULT_HELP innr public abstract interface static Displayer innr public abstract interface static Provider @@ -1437,9 +1490,9 @@ CLSS public org.openide.windows.TopComponent cons public init() cons public init(org.openide.util.Lookup) fld public final static int CLOSE_EACH = 0 - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") fld public final static int CLOSE_LAST = 1 - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") fld public final static int PERSISTENCE_ALWAYS = 0 fld public final static int PERSISTENCE_NEVER = 2 fld public final static int PERSISTENCE_ONLY_OPENED = 1 @@ -1466,7 +1519,7 @@ meth protected final void associateLookup(org.openide.util.Lookup) meth protected java.lang.Object writeReplace() throws java.io.ObjectStreamException meth protected java.lang.String preferredID() meth protected void closeNotify() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth protected void componentActivated() meth protected void componentClosed() meth protected void componentDeactivated() @@ -1474,19 +1527,19 @@ meth protected void componentHidden() meth protected void componentOpened() meth protected void componentShowing() meth protected void openNotify() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean canClose() meth public boolean canClose(org.openide.windows.Workspace,boolean) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public boolean requestFocusInWindow() meth public final boolean close() meth public final boolean close(org.openide.windows.Workspace) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public final boolean isOpened() meth public final boolean isOpened(org.openide.windows.Workspace) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public final int getCloseOperation() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public final int getTabPosition() meth public final org.openide.nodes.Node[] getActivatedNodes() meth public final static org.openide.windows.TopComponent$Registry getRegistry() @@ -1497,7 +1550,7 @@ meth public final void requestAttention(boolean) meth public final void setActivatedNodes(org.openide.nodes.Node[]) meth public final void setAttentionHighlight(boolean) meth public final void setCloseOperation(int) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public int getPersistenceType() meth public java.awt.Image getIcon() meth public java.lang.String getDisplayName() @@ -1510,13 +1563,13 @@ meth public org.openide.awt.UndoRedo getUndoRedo() meth public org.openide.util.HelpCtx getHelpCtx() meth public org.openide.util.Lookup getLookup() meth public org.openide.util.actions.SystemAction[] getSystemActions() - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public org.openide.windows.TopComponent$SubComponent[] getSubComponents() meth public static javax.swing.Action openAction(org.openide.windows.TopComponent,java.lang.String,java.lang.String,boolean) meth public void addNotify() meth public void open() meth public void open(org.openide.windows.Workspace) - anno 0 java.lang.Deprecated() + anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="") meth public void readExternal(java.io.ObjectInput) throws java.io.IOException,java.lang.ClassNotFoundException meth public void requestActive() meth public void requestFocus() diff --git a/enterprise/glassfish.eecommon/nbproject/project.properties b/enterprise/glassfish.eecommon/nbproject/project.properties index 5cd0c0fdd64d..0b7d97848a7e 100644 --- a/enterprise/glassfish.eecommon/nbproject/project.properties +++ b/enterprise/glassfish.eecommon/nbproject/project.properties @@ -15,7 +15,8 @@ # specific language governing permissions and limitations # under the License. is.autoload=true -javac.source=1.8 +javac.source=11 +javac.target=11 javac.compilerargs=-Xlint -Xlint:-serial spec.version.base=1.59.0 diff --git a/enterprise/glassfish.javaee/nbproject/project.properties b/enterprise/glassfish.javaee/nbproject/project.properties index 0bedac5ee352..edf2991e6934 100644 --- a/enterprise/glassfish.javaee/nbproject/project.properties +++ b/enterprise/glassfish.javaee/nbproject/project.properties @@ -15,7 +15,8 @@ # specific language governing permissions and limitations # under the License. javac.compilerargs=-Xlint -Xlint:-serial -javac.source=1.8 +javac.source=11 +javac.target=11 test.config.stableBTD.includes=**/*Test.class test.config.stableBTD.excludes=\ diff --git a/enterprise/glassfish.tooling/nbproject/project.properties b/enterprise/glassfish.tooling/nbproject/project.properties index 0f4ec98bc91a..3213bab58cb5 100644 --- a/enterprise/glassfish.tooling/nbproject/project.properties +++ b/enterprise/glassfish.tooling/nbproject/project.properties @@ -14,5 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -javac.source=1.8 +javac.source=11 +javac.target=11 javac.compilerargs=-Xlint -Xlint:-serial diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java index 225cdf210167..884204cf4c79 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactory.java @@ -57,52 +57,17 @@ public abstract class AdminFactory { */ static AdminFactory getInstance(final GlassFishVersion version) throws CommandException { - switch (version) { - // Use HTTP interface for any GlassFish older than 3. - case GF_1: - throw new CommandException( - CommandException.UNSUPPORTED_VERSION); - case GF_2: - case GF_2_1: - case GF_2_1_1: - return AdminFactoryHttp.getInstance(); - // Use REST interface for GlassFish 3 and 4. - case GF_3: - case GF_3_0_1: - case GF_3_1: - case GF_3_1_1: - case GF_3_1_2: - case GF_3_1_2_2: - case GF_3_1_2_3: - case GF_3_1_2_4: - case GF_3_1_2_5: - case GF_4: - case GF_4_0_1: - case GF_4_1: - case GF_4_1_1: - case GF_4_1_2: - case GF_5: - case GF_5_0_1: - case GF_5_1_0: - case GF_6: - case GF_6_1_0: - case GF_6_2_0: - case GF_6_2_1: - case GF_6_2_2: - case GF_6_2_3: - case GF_6_2_4: - case GF_6_2_5: - case GF_7_0_0: - case GF_7_0_1: - case GF_7_0_2: - case GF_7_0_3: - case GF_7_0_4: - case GF_7_0_5: - case GF_7_0_6: - return AdminFactoryRest.getInstance(); - // Anything else is not unknown. - default: - throw new CommandException(CommandException.UNKNOWN_VERSION); + // Use REST interface for GlassFish 3 and newer. + if (GlassFishVersion.ge(version, GlassFishVersion.GF_3)) { + return AdminFactoryRest.getInstance(); + } + // Use HTTP interface for any GlassFish older than 3. + else if (GlassFishVersion.ge(version, GlassFishVersion.GF_2)) { + return AdminFactoryHttp.getInstance(); + } + // Anything else is not unknown. + else { + throw new CommandException(CommandException.UNKNOWN_VERSION); } } diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java index f9a5d31992e2..382d352ad73a 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java @@ -110,7 +110,13 @@ public enum GlassFishVersion { /** GlassFish 7.0.5 */ GF_7_0_5 ((short) 7, (short) 0, (short) 5, (short) 0, GlassFishVersion.GF_7_0_5_STR), /** GlassFish 7.0.6 */ - GF_7_0_6 ((short) 7, (short) 0, (short) 6, (short) 0, GlassFishVersion.GF_7_0_6_STR); + GF_7_0_6 ((short) 7, (short) 0, (short) 6, (short) 0, GlassFishVersion.GF_7_0_6_STR), + /** GlassFish 7.0.7 */ + GF_7_0_7 ((short) 7, (short) 0, (short) 7, (short) 0, GlassFishVersion.GF_7_0_7_STR), + /** GlassFish 7.0.8 */ + GF_7_0_8 ((short) 7, (short) 0, (short) 8, (short) 0, GlassFishVersion.GF_7_0_8_STR), + /** GlassFish 7.0.9 */ + GF_7_0_9 ((short) 7, (short) 0, (short) 9, (short) 0, GlassFishVersion.GF_7_0_9_STR); //////////////////////////////////////////////////////////////////////////// // Class attributes // //////////////////////////////////////////////////////////////////////////// @@ -295,6 +301,21 @@ public enum GlassFishVersion { static final String GF_7_0_6_STR = "7.0.6"; /** Additional {@code String} representations of GF_7_0_6 value. */ static final String GF_7_0_6_STR_NEXT[] = {"7.0.6", "7.0.6.0"}; + + /** A {@code String} representation of GF_7_0_7 value. */ + static final String GF_7_0_7_STR = "7.0.7"; + /** Additional {@code String} representations of GF_7_0_6 value. */ + static final String GF_7_0_7_STR_NEXT[] = {"7.0.7", "7.0.7.0"}; + + /** A {@code String} representation of GF_7_0_8 value. */ + static final String GF_7_0_8_STR = "7.0.8"; + /** Additional {@code String} representations of GF_7_0_8 value. */ + static final String GF_7_0_8_STR_NEXT[] = {"7.0.8", "7.0.8.0"}; + + /** A {@code String} representation of GF_7_0_9 value. */ + static final String GF_7_0_9_STR = "7.0.9"; + /** Additional {@code String} representations of GF_7_0_9 value. */ + static final String GF_7_0_9_STR_NEXT[] = {"7.0.9", "7.0.9.0"}; /** * Stored String values for backward String @@ -339,6 +360,9 @@ public enum GlassFishVersion { initStringValuesMapFromArray(GF_7_0_4, GF_7_0_4_STR_NEXT); initStringValuesMapFromArray(GF_7_0_5, GF_7_0_5_STR_NEXT); initStringValuesMapFromArray(GF_7_0_6, GF_7_0_6_STR_NEXT); + initStringValuesMapFromArray(GF_7_0_7, GF_7_0_7_STR_NEXT); + initStringValuesMapFromArray(GF_7_0_8, GF_7_0_8_STR_NEXT); + initStringValuesMapFromArray(GF_7_0_9, GF_7_0_9_STR_NEXT); } //////////////////////////////////////////////////////////////////////////// @@ -604,5 +628,21 @@ public String toFullString() { sb.append(Integer.toString(build)); return sb.toString(); } + + /** + * Convert GlassFishVersion value to int + * containing all version numbers. + *

+ * @return A String representation of the value of this object + * containing all version numbers. + */ + public int toFullInteger() { + StringBuilder sb = new StringBuilder(8); + sb.append(Integer.toString(major)); + sb.append(Integer.toString(minor)); + sb.append(Integer.toString(update)); + sb.append(Integer.toString(build)); + return Integer.parseInt(sb.toString()); + } } diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java index ff7c81b5cdfc..b88efa20dabe 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java @@ -19,8 +19,8 @@ package org.netbeans.modules.glassfish.tooling.server.config; import java.net.URL; -import java.util.HashMap; -import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import org.netbeans.modules.glassfish.tooling.data.GlassFishServer; import org.netbeans.modules.glassfish.tooling.data.GlassFishVersion; @@ -44,7 +44,7 @@ public class ConfigBuilderProvider { //////////////////////////////////////////////////////////////////////////// // Class attributes // //////////////////////////////////////////////////////////////////////////// - + /** Library builder default configuration file. */ private static final URL CONFIG_V3 = ConfigBuilderProvider.class.getResource("GlassFishV3.xml"); @@ -148,6 +148,21 @@ public class ConfigBuilderProvider { private static final Config.Next CONFIG_V7_0_6 = new Config.Next(GlassFishVersion.GF_7_0_6, ConfigBuilderProvider.class.getResource("GlassFishV7_0_1.xml")); + + /** Library builder configuration since GlassFish 7.0.7. */ + private static final Config.Next CONFIG_V7_0_7 + = new Config.Next(GlassFishVersion.GF_7_0_7, + ConfigBuilderProvider.class.getResource("GlassFishV7_0_1.xml")); + + /** Library builder configuration since GlassFish 7.0.8. */ + private static final Config.Next CONFIG_V7_0_8 + = new Config.Next(GlassFishVersion.GF_7_0_8, + ConfigBuilderProvider.class.getResource("GlassFishV7_0_1.xml")); + + /** Library builder configuration since GlassFish 7.0.9. */ + private static final Config.Next CONFIG_V7_0_9 + = new Config.Next(GlassFishVersion.GF_7_0_9, + ConfigBuilderProvider.class.getResource("GlassFishV7_0_9.xml")); /** Library builder configuration for GlassFish cloud. */ private static final Config config @@ -157,11 +172,12 @@ public class ConfigBuilderProvider { CONFIG_V6_2_3, CONFIG_V6_2_4, CONFIG_V6_2_5, CONFIG_V7_0_0, CONFIG_V7_0_1, CONFIG_V7_0_2, CONFIG_V7_0_3, CONFIG_V7_0_4, CONFIG_V7_0_5, - CONFIG_V7_0_6); + CONFIG_V7_0_6, CONFIG_V7_0_7, CONFIG_V7_0_8, + CONFIG_V7_0_9); /** Builders array for each server instance. */ - private static final Map builders - = new HashMap<>(); + private static final ConcurrentMap builders + = new ConcurrentHashMap<>(32); //////////////////////////////////////////////////////////////////////////// // Static methods // @@ -192,19 +208,11 @@ public static ConfigBuilder getBuilder(final GlassFishServer server) { throw new ServerConfigException( "GlassFish server entity shall not be null"); } - ConfigBuilder builder; - synchronized (builders) { - builder = builders.get(server); - if (builder != null) { - return builder; - } - String serverHome = server.getServerHome(); - builder = new ConfigBuilder(config, serverHome, serverHome, serverHome); - builders.put(server, builder); - } - return builder; + String serverHome = server.getServerHome(); + return builders.computeIfAbsent(server, key -> + new ConfigBuilder(config, serverHome, serverHome, serverHome)); } - + /** * Remove configuration builder instance for given GlassFish server entity @@ -220,9 +228,7 @@ public static void destroyBuilder(final GlassFishServer server) { throw new ServerConfigException( "GlassFish server entity shall not be null"); } - synchronized (builders) { - builders.remove(server); - } + builders.remove(server); } } diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV7_0_9.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV7_0_9.xml new file mode 100644 index 000000000000..a6e60ca2f028 --- /dev/null +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV7_0_9.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java index b7b05c7582f4..8dfae65fa809 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/JavaSEPlatform.java @@ -22,7 +22,7 @@ import java.util.Map; /** - * JavaSE platforms supported by Glassfish. + * JavaSE platforms supported by GlassFish. *

* @author Tomas Kraus, Peter Benedikovic */ @@ -67,7 +67,11 @@ public enum JavaSEPlatform { /** JavaSE 19. */ v19, /** JavaSE 20. */ - v20; + v20, + /** JavaSE 21. */ + v21, + /** JavaSE 22. */ + v22; //////////////////////////////////////////////////////////////////////////// // Class attributes // @@ -79,60 +83,6 @@ public enum JavaSEPlatform { /** JavaEE platform version elements separator character. */ public static final char SEPARATOR = '.'; - /** A String representation of v1_1 value. */ - static final String V1_1_STR = "1.1"; - - /** A String representation of v1_2 value. */ - static final String V1_2_STR = "1.2"; - - /** A String representation of v1_3 value. */ - static final String V1_3_STR = "1.3"; - - /** A String representation of v1_4 value. */ - static final String V1_4_STR = "1.4"; - - /** A String representation of v1_5 value. */ - static final String V1_5_STR = "1.5"; - - /** A String representation of v1_6 value. */ - static final String V1_6_STR = "1.6"; - - /** A String representation of v1_7 value. */ - static final String V1_7_STR = "1.7"; - - /** A String representation of v1_8 value. */ - static final String V1_8_STR = "1.8"; - - /** A String representation of v11 value. */ - static final String V11_STR = "11"; - - /** A String representation of v12 value. */ - static final String V12_STR = "12"; - - /** A String representation of v13 value. */ - static final String V13_STR = "13"; - - /** A String representation of v14 value. */ - static final String V14_STR = "14"; - - /** A String representation of v15 value. */ - static final String V15_STR = "15"; - - /** A String representation of v16 value. */ - static final String V16_STR = "16"; - - /** A String representation of v17 value. */ - static final String V17_STR = "17"; - - /** A String representation of v18 value. */ - static final String V18_STR = "18"; - - /** A String representation of v19 value. */ - static final String V19_STR = "19"; - - /** A String representation of v20 value. */ - static final String V20_STR = "20"; - /** * Stored String values for backward String * conversion. @@ -183,30 +133,7 @@ public static JavaSEPlatform toValue(final String platformName) { */ @Override public String toString() { - switch (this) { - case v1_1: return V1_1_STR; - case v1_2: return V1_2_STR; - case v1_3: return V1_3_STR; - case v1_4: return V1_4_STR; - case v1_5: return V1_5_STR; - case v1_6: return V1_6_STR; - case v1_7: return V1_7_STR; - case v1_8: return V1_8_STR; - case v11: return V11_STR; - case v12: return V12_STR; - case v13: return V13_STR; - case v14: return V14_STR; - case v15: return V15_STR; - case v16: return V16_STR; - case v17: return V17_STR; - case v18: return V18_STR; - case v19: return V19_STR; - case v20: return V20_STR; - - // This is unrecheable. Being here means this class does not handle - // all possible values correctly. - default: throw new ServerConfigException( - ServerConfigException.INVALID_SE_PLATFORM_VERSION); - } + String n = name(); + return n.startsWith("v1_") ? "1." + n.substring(3) : n.substring(1); } } diff --git a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java index 329508140920..b58d309303ce 100644 --- a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java +++ b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java @@ -176,7 +176,7 @@ public void testGetInstanceforVersionGF6() { @Test public void testGetInstanceforVersionGF7() { GlassFishServerEntity srv = new GlassFishServerEntity(); - srv.setVersion(GlassFishVersion.GF_7_0_6); + srv.setVersion(GlassFishVersion.GF_7_0_9); AdminFactory af = AdminFactory.getInstance(srv.getVersion()); assertTrue(af instanceof AdminFactoryRest); Command cmd = new CommandVersion(); diff --git a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java index 527ef5b6044f..097c4575c127 100644 --- a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java +++ b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java @@ -111,6 +111,12 @@ public void testToValue() { GlassFishVersion.GF_7_0_5_STR_NEXT); verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_6, GlassFishVersion.GF_7_0_6_STR_NEXT); + verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_7, + GlassFishVersion.GF_7_0_7_STR_NEXT); + verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_8, + GlassFishVersion.GF_7_0_8_STR_NEXT); + verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_9, + GlassFishVersion.GF_7_0_9_STR_NEXT); } /** @@ -135,7 +141,8 @@ public void testToValueIncomplete() { GlassFishVersion.GF_7_0_0, GlassFishVersion.GF_7_0_1, GlassFishVersion.GF_7_0_2, GlassFishVersion.GF_7_0_3, GlassFishVersion.GF_7_0_4, GlassFishVersion.GF_7_0_5, - GlassFishVersion.GF_7_0_6 + GlassFishVersion.GF_7_0_6, GlassFishVersion.GF_7_0_7, + GlassFishVersion.GF_7_0_8, GlassFishVersion.GF_7_0_9 }; String strings[] = { "1.0.1.4", "2.0.1.5", "2.1.0.3", "2.1.1.7", @@ -146,7 +153,7 @@ public void testToValueIncomplete() { "6.2.0.0", "6.2.1.0", "6.2.2.0", "6.2.3.0", "6.2.4.0", "6.2.5.0", "7.0.0.0", "7.0.1.0", "7.0.2.0", "7.0.3.0", "7.0.4.0", "7.0.5.0", - "7.0.6.0" + "7.0.6.0", "7.0.7.0", "7.0.8.0", "7.0.9.0" }; for (int i = 0; i < versions.length; i++) { GlassFishVersion version = GlassFishVersion.toValue(strings[i]); diff --git a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java index 00c3e4e55249..c3be362958e7 100644 --- a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java +++ b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java @@ -21,7 +21,7 @@ import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3; import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_4; import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_6_2_5; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_7_0_6; +import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_7_0_9; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import org.testng.annotations.Test; @@ -47,8 +47,8 @@ public class EnumUtilsTest { */ @Test public void testEq() { - assertFalse(EnumUtils.eq(GF_7_0_6, GF_6_2_5), "Equals for a > b shall be false."); - assertTrue(EnumUtils.eq(GF_7_0_6, GF_7_0_6), "Equals for a == b shall be true."); + assertFalse(EnumUtils.eq(GF_7_0_9, GF_6_2_5), "Equals for a > b shall be false."); + assertTrue(EnumUtils.eq(GF_7_0_9, GF_7_0_9), "Equals for a == b shall be true."); assertFalse(EnumUtils.eq(GF_4, GF_3), "Equals for a > b shall be false."); assertTrue(EnumUtils.eq(GF_4, GF_4), "Equals for a == b shall be true."); assertFalse(EnumUtils.eq(GF_3, GF_4), "Equals for a < b shall be false."); @@ -69,8 +69,8 @@ public void testEq() { */ @Test public void testNe() { - assertTrue(EnumUtils.ne(GF_7_0_6, GF_6_2_5), "Not equals for a > b shall be true."); - assertFalse(EnumUtils.ne(GF_7_0_6, GF_7_0_6), "Not equals for a == b shall be false."); + assertTrue(EnumUtils.ne(GF_7_0_9, GF_6_2_5), "Not equals for a > b shall be true."); + assertFalse(EnumUtils.ne(GF_7_0_9, GF_7_0_9), "Not equals for a == b shall be false."); assertTrue(EnumUtils.ne(GF_4, GF_3), "Not equals for a > b shall be true."); assertFalse(EnumUtils.ne(GF_4, GF_4), "Not equals for a == b shall be false."); assertTrue(EnumUtils.ne(GF_3, GF_4), "Not equals for a < b shall be true."); @@ -91,8 +91,8 @@ public void testNe() { */ @Test public void testLt() { - assertFalse(EnumUtils.lt(GF_7_0_6, GF_6_2_5), "Less than for a > b shall be false."); - assertFalse(EnumUtils.lt(GF_7_0_6, GF_7_0_6), "Less than for a == b shall be false."); + assertFalse(EnumUtils.lt(GF_7_0_9, GF_6_2_5), "Less than for a > b shall be false."); + assertFalse(EnumUtils.lt(GF_7_0_9, GF_7_0_9), "Less than for a == b shall be false."); assertFalse(EnumUtils.lt(GF_4, GF_3), "Less than for a > b shall be false."); assertFalse(EnumUtils.lt(GF_4, GF_4), "Less than for a == b shall be false."); assertTrue(EnumUtils.lt(GF_3, GF_4), "Less than for a < b shall be true."); @@ -113,8 +113,8 @@ public void testLt() { */ @Test public void testLe() { - assertFalse(EnumUtils.le(GF_7_0_6, GF_6_2_5), "Less than or equal for a > b shall be false."); - assertTrue(EnumUtils.le(GF_7_0_6, GF_7_0_6), "Less than or equal for a == b shall be true."); + assertFalse(EnumUtils.le(GF_7_0_9, GF_6_2_5), "Less than or equal for a > b shall be false."); + assertTrue(EnumUtils.le(GF_7_0_9, GF_7_0_9), "Less than or equal for a == b shall be true."); assertFalse(EnumUtils.le(GF_4, GF_3), "Less than or equal for a > b shall be false."); assertTrue(EnumUtils.le(GF_4, GF_4), "Less than or equal for a == b shall be true."); assertTrue(EnumUtils.le(GF_3, GF_4), "Less than or equal for a < b shall be true."); @@ -135,8 +135,8 @@ public void testLe() { */ @Test public void testGt() { - assertTrue(EnumUtils.gt(GF_7_0_6, GF_6_2_5), "Greater than for a > b shall be true."); - assertFalse(EnumUtils.gt(GF_7_0_6, GF_7_0_6), "Greater than for a == b shall be false."); + assertTrue(EnumUtils.gt(GF_7_0_9, GF_6_2_5), "Greater than for a > b shall be true."); + assertFalse(EnumUtils.gt(GF_7_0_9, GF_7_0_9), "Greater than for a == b shall be false."); assertTrue(EnumUtils.gt(GF_4, GF_3), "Greater than for a > b shall be true."); assertFalse(EnumUtils.gt(GF_4, GF_4), "Greater than for a == b shall be false."); assertFalse(EnumUtils.gt(GF_3, GF_4), "Greater than for a < b shall be false."); @@ -157,8 +157,8 @@ public void testGt() { */ @Test public void testGe() { - assertTrue(EnumUtils.ge(GF_7_0_6, GF_6_2_5), "Greater than or equal for a > b shall be true."); - assertTrue(EnumUtils.ge(GF_7_0_6, GF_7_0_6), "Greater than or equal for a == b shall be true."); + assertTrue(EnumUtils.ge(GF_7_0_9, GF_6_2_5), "Greater than or equal for a > b shall be true."); + assertTrue(EnumUtils.ge(GF_7_0_9, GF_7_0_9), "Greater than or equal for a == b shall be true."); assertTrue(EnumUtils.ge(GF_4, GF_3), "Greater than or equal for a > b shall be true."); assertTrue(EnumUtils.ge(GF_4, GF_4), "Greater than or equal for a == b shall be true."); assertFalse(EnumUtils.ge(GF_3, GF_4), "Greater than or equal for a < b shall be false.");