JBIDE-29058: fix build after TP update

Signed-off-by: Stephane Bouchet <[email protected]>
jbosstools · Sep 8, 2023 · efc35f0 · efc35f0
1 parent efb5202
commit efc35f0
Show file tree

Hide file tree

Showing 33 changed files with 55 additions and 49 deletions.
diff --git a/features/org.jboss.tools.jst.feature/feature.xml b/features/org.jboss.tools.jst.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.jst.feature"
       label="%featureName"
-      version="3.10.400.qualifier"
+      version="3.10.500.qualifier"
       provider-name="%providerName"
       plugin="org.jboss.tools.jst.web.ui"
       license-feature="org.jboss.tools.foundation.license.feature"

diff --git a/features/org.jboss.tools.jst.feature/pom.xml b/features/org.jboss.tools.jst.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.jst</groupId>
 		<artifactId>features</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst.features</groupId>
 	<artifactId>org.jboss.tools.jst.feature</artifactId> 

diff --git a/features/org.jboss.tools.jst.test.feature/feature.xml b/features/org.jboss.tools.jst.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jboss.tools.jst.test.feature"
       label="%featureName"
-      version="3.10.400.qualifier"
+      version="3.10.500.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
       license-feature-version="0.0.0">

diff --git a/features/org.jboss.tools.jst.test.feature/pom.xml b/features/org.jboss.tools.jst.test.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.jst</groupId>
 		<artifactId>features</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst.features</groupId>
 	<artifactId>org.jboss.tools.jst.test.feature</artifactId> 

diff --git a/features/pom.xml b/features/pom.xml
@@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>jst</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst</groupId>
 	<artifactId>features</artifactId>
 	<name>jst.features</name>
-	<version>3.10.400-SNAPSHOT</version>
+	<version>3.10.500-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.jboss.tools.jst.feature</module>

diff --git a/plugins/org.jboss.tools.jst.web.kb/.classpath b/plugins/org.jboss.tools.jst.web.kb/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="src" path="resources/"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.jboss.tools.jst.web.kb/.settings/org.eclipse.jdt.core.prefs b/plugins/org.jboss.tools.jst.web.kb/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.jst.web.kb;singleton:=true
 Bundle-Localization: plugin
-Bundle-Version: 3.10.400.qualifier
+Bundle-Version: 3.10.500.qualifier
 Bundle-Activator: org.jboss.tools.jst.web.kb.WebKbPlugin
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",

diff --git a/plugins/org.jboss.tools.jst.web.kb/pom.xml b/plugins/org.jboss.tools.jst.web.kb/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.jst</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst.tests</groupId>
 	<artifactId>org.jboss.tools.jst.web.kb</artifactId> 

diff --git a/plugins/org.jboss.tools.jst.web.ui/.classpath b/plugins/org.jboss.tools.jst.web.ui/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="resources/"/>
 	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.jboss.tools.jst.web.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.jboss.tools.jst.web.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF
@@ -105,6 +105,6 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",
  org.eclipse.datatools.connectivity.db.generic.ui;bundle-version="1.0.1",
  org.jboss.tools.common.el.ui,
  org.eclipse.wst.html.core;bundle-version="1.1.502"
-Bundle-Version: 3.10.400.qualifier
+Bundle-Version: 3.10.500.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ClassPath: .
diff --git a/plugins/org.jboss.tools.jst.web.ui/pom.xml b/plugins/org.jboss.tools.jst.web.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.jst</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst.plugins</groupId>
 	<artifactId>org.jboss.tools.jst.web.ui</artifactId> 

diff --git a/...g.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/palette/CustomDrawerEditPart.java b/...g.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/palette/CustomDrawerEditPart.java
@@ -34,8 +34,8 @@ public IFigure getToolTip() {
 				return createToolTip();
 			}
 		};
-		fig.setExpanded(getDrawer().isInitiallyOpen());
-		fig.setPinned(getDrawer().isInitiallyPinned());
+		fig.setExpanded(getModel().isInitiallyOpen());
+		fig.setPinned(getModel().isInitiallyPinned());
 		fig.getCollapseToggle().setRequestFocusEnabled(true);
 		fig.getCollapseToggle().addFocusListener(new FocusListener() {
 			public void focusGained(FocusEvent fe) {

diff --git a/...g.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/palette/MobileDrawerEditPart.java b/...g.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/palette/MobileDrawerEditPart.java
@@ -48,8 +48,8 @@ public IFigure getToolTip() {
                                 return createToolTip();
                         }
                 };
-                fig.setExpanded(getDrawer().isInitiallyOpen());
-                fig.setPinned(getDrawer().isInitiallyPinned());
+                fig.setExpanded(getModel().isInitiallyOpen());
+                fig.setPinned(getModel().isInitiallyPinned());
                 fig.getCollapseToggle().setRequestFocusEnabled(true);
                 fig.getCollapseToggle().addFocusListener(new FocusListener() {
                         public void focusGained(FocusEvent fe) {
@@ -66,8 +66,8 @@ public IFigure getToolTip() {
                                 return createToolTip();
                         }
                 };
-                fig.setExpanded(getDrawer().isInitiallyOpen());
-                fig.setPinned(getDrawer().isInitiallyPinned());
+                fig.setExpanded(getModel().isInitiallyOpen());
+                fig.setPinned(getModel().isInitiallyPinned());
                 fig.getCollapseToggle().setRequestFocusEnabled(true);
                 fig.getCollapseToggle().addFocusListener(new FocusListener() {
                         public void focusGained(FocusEvent fe) {
@@ -128,7 +128,7 @@ private void updateMessage() {
 		}
 
         private boolean isNoVisibleItems(){
-        	for(Object child : getDrawer().getChildren()){
+        	for(Object child : getModel().getChildren()){
         		if(!(child instanceof PaletteSeparator) && ((PaletteTool)child).isVisible()){
         			return false;
         		}
@@ -137,7 +137,7 @@ private boolean isNoVisibleItems(){
         }
 
         private boolean isEmpty(){
-        	for(Object child : getDrawer().getChildren()){
+        	for(Object child : getModel().getChildren()){
         		if(!(child instanceof PaletteSeparator)){
         			return false;
         		}

diff --git a/plugins/org.jboss.tools.jst.web/.settings/org.eclipse.jdt.core.prefs b/plugins/org.jboss.tools.jst.web/.settings/org.eclipse.jdt.core.prefs
@@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.6
diff --git a/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF b/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Require-Bundle: org.jboss.tools.common.model;visibility:=reexport,
  org.eclipse.jst.j2ee.ejb;bundle-version="1.1.502",
  org.eclipse.jst.j2ee.web;bundle-version="1.1.500",
  org.eclipse.jst.jee.web;bundle-version="1.0.400"
-Bundle-Version: 3.10.400.qualifier
+Bundle-Version: 3.10.500.qualifier
 Export-Package: 
  org.jboss.tools.jst.web,
  org.jboss.tools.jst.web.browser,

diff --git a/plugins/org.jboss.tools.jst.web/pom.xml b/plugins/org.jboss.tools.jst.web/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.jst</groupId>
 		<artifactId>plugins</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst.plugins</groupId>
 	<artifactId>org.jboss.tools.jst.web</artifactId> 

diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>jst</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst</groupId>
 	<artifactId>plugins</artifactId>
 	<name>jst.plugins</name>
-	<version>3.10.400-SNAPSHOT</version>
+	<version>3.10.500-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.jboss.tools.jst.web</module>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<artifactId>jst</artifactId>
 	<name>jbosstools-jst</name>
-	<version>3.10.400-SNAPSHOT</version>
+	<version>3.10.500-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<properties>
 		<tycho.scmUrl>scm:git:https://github.com/jbosstools/jbosstools-jst.git</tycho.scmUrl>

diff --git a/site/pom.xml b/site/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>jst</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst</groupId>
 	<artifactId>jst.site</artifactId> 

diff --git a/test-framework/org.jboss.tools.jst.reddeer/META-INF/MANIFEST.MF b/test-framework/org.jboss.tools.jst.reddeer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JST Reddeer
 Bundle-SymbolicName: org.jboss.tools.jst.reddeer
-Bundle-Version: 3.10.400.qualifier
+Bundle-Version: 3.10.500.qualifier
 Bundle-Activator: org.jboss.tools.jst.reddeer.Activator
 Require-Bundle: org.eclipse.ui,
  org.junit,

diff --git a/test-framework/org.jboss.tools.jst.reddeer/pom.xml b/test-framework/org.jboss.tools.jst.reddeer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.jboss.tools.jst</groupId>
 		<artifactId>test-framework</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst</groupId>
 	<artifactId>org.jboss.tools.jst.reddeer</artifactId>

diff --git a/test-framework/pom.xml b/test-framework/pom.xml
@@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>jst</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst</groupId>
 	<artifactId>test-framework</artifactId>
 	<name>jst.test-framework</name>
-	<version>3.10.400-SNAPSHOT</version>
+	<version>3.10.500-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.jboss.tools.jst.reddeer</module>

diff --git a/tests/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF b/tests/org.jboss.tools.jst.jsp.base.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Base Classes for JSP Editor Related Tests
 Bundle-SymbolicName: org.jboss.tools.jst.jsp.base.test;singleton:=true
-Bundle-Version: 3.10.400.qualifier
+Bundle-Version: 3.10.500.qualifier
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.jface;bundle-version="3.7.0",
  org.eclipse.core.resources;bundle-version="3.7.100",

diff --git a/tests/org.jboss.tools.jst.jsp.base.test/pom.xml b/tests/org.jboss.tools.jst.jsp.base.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.jst</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst.plugins</groupId>
 	<artifactId>org.jboss.tools.jst.jsp.base.test</artifactId>

diff --git a/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF b/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.jst.web.kb.test;singleton:=true
 Bundle-Localization: plugin
-Bundle-Version: 3.10.400.qualifier
+Bundle-Version: 3.10.500.qualifier
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,

diff --git a/tests/org.jboss.tools.jst.web.kb.test/pom.xml b/tests/org.jboss.tools.jst.web.kb.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.jst</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst.tests</groupId>
 	<artifactId>org.jboss.tools.jst.web.kb.test</artifactId> 

diff --git a/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF b/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.jst.web.test;singleton:=true
-Bundle-Version: 3.10.400.qualifier
+Bundle-Version: 3.10.500.qualifier
 Require-Bundle: org.jboss.tools.jst.web,
  org.jboss.tools.common.base.test,
  org.eclipse.core.runtime,

diff --git a/tests/org.jboss.tools.jst.web.test/pom.xml b/tests/org.jboss.tools.jst.web.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.jst</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst.tests</groupId>
 	<artifactId>org.jboss.tools.jst.web.test</artifactId>

diff --git a/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF b/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.jst.web.ui.test;singleton:=true
-Bundle-Version: 3.10.400.qualifier
+Bundle-Version: 3.10.500.qualifier
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.jboss.tools.jst.web.ui,
  org.jboss.tools.jst.web,

diff --git a/tests/org.jboss.tools.jst.web.ui.test/pom.xml b/tests/org.jboss.tools.jst.web.ui.test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.jboss.tools.jst</groupId>
 		<artifactId>tests</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst.tests</groupId>
 	<artifactId>org.jboss.tools.jst.web.ui.test</artifactId> 

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<parent>
 		<groupId>org.jboss.tools</groupId>
 		<artifactId>jst</artifactId>
-		<version>3.10.400-SNAPSHOT</version>
+		<version>3.10.500-SNAPSHOT</version>
 	</parent>
 	<groupId>org.jboss.tools.jst</groupId>
 	<artifactId>tests</artifactId>
 	<name>jst.tests</name>
-	<version>3.10.400-SNAPSHOT</version>
+	<version>3.10.500-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>org.jboss.tools.jst.jsp.base.test</module>