JBoss Tools SVN: r42681 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-07-24 00:03:57 -0400 (Tue, 24 Jul 2012)
New Revision: 42681
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
Log:
JBIDE-12216 missed file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2012-07-24 03:53:23 UTC (rev 42680)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2012-07-24 04:03:57 UTC (rev 42681)
@@ -99,15 +99,17 @@
}
private String[] handleAsynchCallbacks(String[] prompts) {
- List<String> tmp = new ArrayList<String>();
- tmp.addAll(Arrays.asList(prompts));
- setRequiredProperties(tmp);
- RequiresInfoException e2 = new RequiresInfoException("Requires proper credentials"); //$NON-NLS-1$
- setRequiredInfoException(e2);
- while( !getDone() && !getCanceled() && getRequiredPropertiesReturned() == null ) {
- try {
- Thread.sleep(500);
- } catch(InterruptedException ie) {/* Do nothing */}
+ if( getRequiredPropertiesReturned() == null ) {
+ List<String> tmp = new ArrayList<String>();
+ tmp.addAll(Arrays.asList(prompts));
+ setRequiredProperties(tmp);
+ RequiresInfoException e2 = new RequiresInfoException("Requires proper credentials"); //$NON-NLS-1$
+ setRequiredInfoException(e2);
+ while( !getDone() && !getCanceled() && getRequiredPropertiesReturned() == null ) {
+ try {
+ Thread.sleep(500);
+ } catch(InterruptedException ie) {/* Do nothing */}
+ }
}
if( getDone() || getCanceled() )
@@ -119,6 +121,7 @@
// If not cleared then it will keep asking for username/password
setRequiredInfoException(null);
+ setRequiredProperties(null);
return retPrompts;
}
@@ -184,9 +187,21 @@
serverState = service.getServerState(managementDetails);
return serverState == JBoss7ServerState.RUNNING;
} catch (Exception e) {
+ Throwable root = getRootException(e);
+ // If the exception is one that autnentication failed, re-prompt.
+ if(root != null && root.getMessage() != null && root.getMessage().startsWith("Authentication failed:")) //$NON-NLS-1$
+ provideCredentials(null);
+ // Otherwise, keep trying.
return false;
}
}
+
+ private Throwable getRootException(Throwable e) {
+ Throwable cause = e.getCause();
+ if( cause != e && cause != null )
+ return getRootException(cause);
+ return cause == null ? e : cause;
+ }
private boolean checkShutdown(IJBoss7ManagerService service) {
try {
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r42680 - in trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test: publishing/v2 and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-07-23 23:53:23 -0400 (Mon, 23 Jul 2012)
New Revision: 42680
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/JBossLaunchConfigTests.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ProjectRuntimeUtil.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/CreateProjectOperationsUtility.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/ProjectCreationUtil.java
Log:
various cleanup of the test plugin
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/JBossLaunchConfigTests.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/JBossLaunchConfigTests.java 2012-07-23 22:33:19 UTC (rev 42679)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/JBossLaunchConfigTests.java 2012-07-24 03:53:23 UTC (rev 42680)
@@ -13,7 +13,9 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties;
+import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.LocalJBossStartLaunchConfigurator;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7LaunchConfigProperties;
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
@@ -30,7 +32,7 @@
}
public void testConfiguration() throws CoreException {
- ILaunchConfigurationWorkingCopy launchConfig = LaunchConfigConfiguratorFactory.createCustomConfigLocationLaunchConfig(mockServer);
+ ILaunchConfigurationWorkingCopy launchConfig = createCustomConfigLocationLaunchConfig(mockServer);
JBossLaunchConfigProperties props = new JBossLaunchConfigProperties();
assertTrue(props.areProgramArgumentsSet(launchConfig));
assertTrue(props.areVMArgumentsSet(launchConfig));
@@ -49,4 +51,22 @@
}
+ public static ILaunchConfigurationWorkingCopy createCustomConfigLocationLaunchConfig(IServer mockServer) throws CoreException {
+ MockLaunchConfigWorkingCopy launchConfig = new MockLaunchConfigWorkingCopy();
+ LocalJBossStartLaunchConfigurator configurator = new LocalJBossStartLaunchConfigurator(mockServer) {
+ @Override
+ protected boolean isCustomConfigLocation(IJBossServerRuntime runtime) {
+ return false;
+ }
+ };
+ configurator.configure(launchConfig);
+ return launchConfig;
+ }
+
+ public static MockLaunchConfigWorkingCopy createNonCustomConfigLocationLaunchConfig(IServer server) throws CoreException {
+ MockLaunchConfigWorkingCopy launchConfig = new MockLaunchConfigWorkingCopy();
+ new LocalJBossStartLaunchConfigurator(server).configure(launchConfig);
+ return launchConfig;
+ }
+
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2012-07-23 22:33:19 UTC (rev 42679)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2012-07-24 03:53:23 UTC (rev 42680)
@@ -38,6 +38,8 @@
protected static String expectedRoot = MOCK_ROOT;
protected static String expectedTempRoot = MOCK_TEMP_ROOT;
+ protected static RuntimeException error = null;
+
public IPublishCopyCallbackHandler getCallbackHandler(IPath path,
IServer server) {
return new MockCopyCallbackHandler(path, null);
@@ -57,9 +59,6 @@
return "/" + MOCK_TEMP_ROOT;
}
-
-
-
public String getPublishMethodId() {
return PUBLISH_METHOD_ID;
}
@@ -70,6 +69,7 @@
copiedFiles.clear();
expectedRoot = MOCK_ROOT;
expectedTempRoot = MOCK_TEMP_ROOT;
+ error = null;
}
public static void setExpectedRoot(String s) {
@@ -93,18 +93,26 @@
public static IPath[] getTempPaths() {
return (IPath[]) tempFiles.toArray(new IPath[tempFiles.size()]);
}
+ public static Exception getError() {
+ return error;
+ }
public class MockCopyCallbackHandler implements IPublishCopyCallbackHandler {
private IPath root, tempRoot;
public MockCopyCallbackHandler(IPath root, IPath tempRoot) {
if( !(new Path(expectedRoot).isPrefixOf(root))) {
- System.out.println("Expected " + new Path(MOCK_ROOT) + " but got: " + root.toString());
- throw new RuntimeException("Unacceptable use of callback handler");
+ String e = "Expected " + new Path(MOCK_ROOT) + " but got: " + root.toString();
+ System.out.println(e);
+ System.out.println(expectedRoot);
+ error = new RuntimeException("Unacceptable use of callback handler: " + e);
+ throw error;
}
if( tempRoot != null && !(new Path(expectedTempRoot).isPrefixOf(tempRoot))) {
- System.out.println("Expected " + new Path(MOCK_TEMP_ROOT) + " but got: " + root.toString());
- throw new RuntimeException("Unacceptable use of callback handler");
+ String e = "Expected " + new Path(MOCK_TEMP_ROOT) + " but got: " + root.toString();
+ System.out.println(e);
+ error = new RuntimeException("Unacceptable use of callback handler: " + e);
+ throw error;
}
this.root = root;
this.tempRoot = tempRoot;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ProjectRuntimeUtil.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ProjectRuntimeUtil.java 2012-07-23 22:33:19 UTC (rev 42679)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ProjectRuntimeUtil.java 2012-07-24 03:53:23 UTC (rev 42680)
@@ -67,7 +67,7 @@
public static IRuntime createRuntime(String runtimeName, String runtimeTypeId, String asHome, String configuration) throws CoreException {
IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null,null, runtimeTypeId);
- assertEquals("expects only one runtime type for jboss 4.2", runtimeTypes.length, 1);
+ assertEquals("expects only one runtime type for "+ runtimeTypeId, runtimeTypes.length, 1);
IRuntimeType runtimeType = runtimeTypes[0];
RuntimeWorkingCopy jbossRuntime = (RuntimeWorkingCopy)runtimeType.createRuntime(runtimeName, new NullProgressMonitor());
jbossRuntime.setLocation(new Path(asHome));
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/CreateProjectOperationsUtility.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/CreateProjectOperationsUtility.java 2012-07-23 22:33:19 UTC (rev 42679)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/CreateProjectOperationsUtility.java 2012-07-24 03:53:23 UTC (rev 42680)
@@ -37,6 +37,8 @@
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
+import org.eclipse.jst.j2ee.project.facet.IJavaUtilityProjectCreationDataModelProperties;
+import org.eclipse.jst.j2ee.project.facet.JavaUtilityProjectCreationDataModelProvider;
import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetInstallDataModelProperties;
@@ -75,7 +77,26 @@
private static final String CONNECTOR_PROJ_1 = "myConnector_1";
private static final String CONNECTOR_PROJ_15 = "myConnector_15";
-
+
+ /**
+ * Creates and returns a utility project DM provider with the given name and of the given version.
+ * If earName is not null then util project will be added to the EAR with earName
+ *
+ * @param projName name of the project to create
+ * @param earName name of the ear to add the project too, if NULL then don't add to an EAR
+ * @param version version of Application Client to use
+ * @return a Utility Project Data Model with the appropriate properties set
+ */
+ public static IDataModel getUtilityProjectCreationDataModel(String projName, String earName){
+ IDataModel dm = DataModelFactory.createDataModel(new JavaUtilityProjectCreationDataModelProvider());
+ dm.setProperty(IJavaUtilityProjectCreationDataModelProperties.PROJECT_NAME, projName);
+ dm.setProperty(IJavaUtilityProjectCreationDataModelProperties.SOURCE_FOLDER, "src");
+ if(earName != null) {
+ dm.setProperty(IJavaUtilityProjectCreationDataModelProperties.EAR_PROJECT_NAME, earName);
+ }
+ return dm;
+ }
+
public void testEAR12_Defaults() throws Exception{
IDataModel dm = getEARDataModel("aEAR", null, null, null, JavaEEFacetConstants.EAR_12, true);
OperationTestCase.runAndVerify(dm);
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/ProjectCreationUtil.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/ProjectCreationUtil.java 2012-07-23 22:33:19 UTC (rev 42679)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/wtp/ProjectCreationUtil.java 2012-07-24 03:53:23 UTC (rev 42680)
@@ -10,449 +10,7 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.test.util.wtp;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.earcreation.IEarFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.facet.EARFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.jca.project.facet.IConnectorFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJavaUtilityProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaUtilityProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetInstallDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+public class ProjectCreationUtil extends CreateProjectOperationsUtility {
-public class ProjectCreationUtil {
- static {
- try {
- } catch(Throwable t) {
- t.printStackTrace();
- }
-
- }
-
- public static final String APP_CLIENT_PROJ_12 = "myAppClient_12";
- public static final String APP_CLIENT_PROJ_13 = "myAppClient_13";
- public static final String APP_CLIENT_PROJ_14 = "myAppClient_14";
- public static final String APP_CLIENT_PROJ_5 = "myAppClient_5";
-
- public static final String EJB_PROJ_11 = "myEJB_11";
- public static final String EJB_PROJ_2 = "myEJB_2";
- public static final String EJB_PROJ_21 = "myEJB_21";
- public static final String EJB_PROJ_3 = "myEJB_3";
-
- public static final String WEB_PROJ_22 = "myWeb_22";
- public static final String WEB_PROJ_23 = "myWeb_23";
- public static final String WEB_PROJ_24 = "myWeb_24";
- public static final String WEB_PROJ_25 = "myWeb_25";
-
- public static final String CONNECTOR_PROJ_1 = "myConnector_1";
- public static final String CONNECTOR_PROJ_15 = "myConnector_15";
-
- /**
- * Creates and returns a utility project DM provider with the given name and of the given version.
- * If earName is not null then util project will be added to the EAR with earName
- *
- * @param projName name of the project to create
- * @param earName name of the ear to add the project too, if NULL then don't add to an EAR
- * @param version version of Application Client to use
- * @return a Utility Project Data Model with the appropriate properties set
- */
- public static IDataModel getUtilityProjectCreationDataModel(String projName, String earName){
- IDataModel dm = DataModelFactory.createDataModel(new JavaUtilityProjectCreationDataModelProvider());
- dm.setProperty(IJavaUtilityProjectCreationDataModelProperties.PROJECT_NAME, projName);
- dm.setProperty(IJavaUtilityProjectCreationDataModelProperties.SOURCE_FOLDER, "src");
- if(earName != null) {
- dm.setProperty(IJavaUtilityProjectCreationDataModelProperties.EAR_PROJECT_NAME, earName);
- }
- return dm;
- }
-
-
-
- /**
- * Creates and returns an Connector Data Model with the given name and of the given version.
- * If earName is not null then Connector will be added to the EAR with earName.
- * Can also specify none default source folder
- *
- * @param projName name of the project to create
- * @param earName name of the EAR to add the project too, if NULL then don't add to an EAR
- * @param sourceFolder name of the source folder to use, if NULL then use default
- * @param version version of Application Client to use
- * @return a Connector Model with the appropriate properties set
- */
- public static IDataModel getConnectorDataModel(String projName, String earName, String sourceFolder, IProjectFacetVersion version){
- IDataModel dm = DataModelFactory.createDataModel(new ConnectorFacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projName);
-
- if(earName != null) {
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, true);
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME, earName);
- } else {
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, false);
- }
-
- FacetDataModelMap facetMap = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel facetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.JCA);
- facetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, version);
-
- if(sourceFolder != null) {
- facetModel.setProperty(IConnectorFacetInstallDataModelProperties.CONFIG_FOLDER, sourceFolder);
- }
-
- //be sure to use Java5 with JEE5
- if(version == JavaEEFacetConstants.CONNECTOR_15){
- IDataModel javaFacetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.JAVA);
- javaFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, JavaEEFacetConstants.JAVA_5);
- }
-
- return dm;
- }
-
- /**
- * Creates and returns an EJB Data Model with the given name and of the given version.
- * Can also set the clientName to be different then the default.
- * If earName is not null then AppClient will be added to the EAR with earName, and if appropriate
- * with or without a deployment descriptor.
- *
- * @param projName name of the project to create
- * @param clientName name of client jar to create, if NULL or earName is NULL then don't create one
- * @param clientSourceFolder source folder for client, use default if value is NULL, ignored if clientName is NULL
- * @param earName name of the EAR to add the project too, if NULL then don't add to an EAR
- * @param version version of EJB to use
- * @param createDD only used if version is JEE5, if true then create DD else don't
- * @return an EJB Model with the appropriate properties set
- */
- public static IDataModel getEJBDataModel(String projName, String clientName, String clientSourceFolder, String earName, IProjectFacetVersion version, boolean createDD) {
- IDataModel dm = DataModelFactory.createDataModel(new EjbFacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projName);
-
- FacetDataModelMap facetMap = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel facetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.EJB);
- facetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, version);
-
- if(earName != null) {
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, true);
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME, earName);
-
- //only create client if given a client name, and is added to EAR
- if(clientName != null) {
- facetModel.setBooleanProperty(IEjbFacetInstallDataModelProperties.CREATE_CLIENT, true);
- facetModel.setStringProperty(IEjbFacetInstallDataModelProperties.CLIENT_NAME, clientName);
-
- //use default source folder unless different name is given
- if(clientSourceFolder != null) {
- facetModel.setStringProperty(IEjbFacetInstallDataModelProperties.CLIENT_SOURCE_FOLDER, clientSourceFolder);
- }
- }
- } else {
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, false);
- }
-
- facetModel.setBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, createDD);
-
-// if(version.equals(JavaEEFacetConstants.EJB_31))
-// {
-// IDataModel javaFacetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.JAVA);
-// javaFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, JavaEEFacetConstants.JAVA_6);
-// }
-// else{
- IDataModel javaFacetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.JAVA);
- javaFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, JavaEEFacetConstants.JAVA_5);
-// }
-
-
- return dm;
- }
-
- /**
- * Creates and returns an EJB Data Model with the given name and of the given version.
- * Can also set the clientName to be different then the default, or choose not to have a client.
- * If earName is not null then AppClient will be added to the EAR with earName, and if appropriate
- * with or without a deployment descriptor.
- *
- * Created so EJB's could be created without clients.
- *
- * @param projName name of the project to create
- * @param clientName name of client jar to create, if NULL or earName is NULL then don't create one
- * @param clientSourceFolder source folder for client, use default if value is NULL, ignored if clientName is NULL
- * @param earName name of the EAR to add the project too, if NULL then don't add to an EAR
- * @param version version of EJB to use
- * @param createClient if True and earName not NULL then create with client, else dont
- * @param createDD only used if version is JEE5, if true then create DD else don't
- * @return an EJB Model with the appropriate properties set
- */
- public static IDataModel getEJBDataModel(String projName, String clientName, String clientSourceFolder, String earName, IProjectFacetVersion version, boolean createCleint, boolean createDD) {
- IDataModel dm = getEJBDataModel(projName, clientName, clientSourceFolder, earName, version, createDD);
-
- FacetDataModelMap facetMap = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel facetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.EJB);
- facetModel.setBooleanProperty(IEjbFacetInstallDataModelProperties.CREATE_CLIENT, createCleint);
-
- return dm;
- }
-
- /**
- * Creates and returns an Application Client Data Model with the given name and of the given version.
- * If earName is not null then AppClient will be added to the EAR with earName, and if appropriate
- * with or without a deployment descriptor.
- *
- * @param projName name of the project to create
- * @param earName name of the ear to add the project too, if NULL then don't add to an EAR
- * @param version version of Application Client to use
- * @param createDefaultMainClass if true then create default main class, else don't
- * @param createDD only used if version is JEE5, if true then create DD else don't
- * @return an Application Data Model with the appropriate properties set
- */
- public static IDataModel getAppClientCreationDataModel(String projName, String earName, IProjectFacetVersion version, boolean createDefaultMainClass, boolean createDD){
- IDataModel dm = DataModelFactory.createDataModel(new AppClientFacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projName);
-
- if(earName != null) {
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, true);
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME, earName);
- } else {
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, false);
- }
-
- FacetDataModelMap facetMap = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel facetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.APPLICATION_CLIENT);
- facetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, version);
- facetModel.setProperty(IAppClientFacetInstallDataModelProperties.CREATE_DEFAULT_MAIN_CLASS, createDefaultMainClass);
-
-
- facetModel.setBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, createDD);
-
- IDataModel javaFacetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.JAVA);
- javaFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, JavaEEFacetConstants.JAVA_5);
-
- return dm;
- }
-
- /**
- * Creates and returns a Web Data Model with the given name and of the given version.
- * Can also be used to specify none default context root, content directory, and/or
- * the java source directory.
- * If earName is not null then Web will be added to the EAR with earName, and if appropriate
- * with or without a deployment descriptor.
- *
- * @param projName name of the project to create
- * @param earName name of the ear to add the project too, if NULL then don't add to an EAR
- * @param contextRoot the context root to use for this project, use default if NULL
- * @param contentDir the content directory to use for this project, use default if NULL
- * @param javaSrcDir the java source directory to use for this project, use default if NULL
- * @param version version of Web to use
- * @param createDD only used if version is JEE5, if true then create DD else don't
- * @return a Web Data Model with the appropriate properties set
- */
- public static IDataModel getWebDataModel(String projName, String earName, String contextRoot, String contentDir, String javaSrcDir, IProjectFacetVersion version, boolean createDD){
- IDataModel dm = DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projName);
-
- if(earName != null) {
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, true);
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME, earName);
- } else {
- dm.setProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, false);
- }
-
- FacetDataModelMap facetMap = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel facetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.DYNAMIC_WEB);
- facetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, version);
-
- //if no contextRoot provided use default, contextRoot only matters if adding to EAR
- if(contextRoot != null && earName != null) {
- facetModel.setStringProperty(IWebFacetInstallDataModelProperties.CONTEXT_ROOT, contextRoot);
- }
-
- //if no contentDir provided use default
- if(contentDir != null) {
- facetModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER, contentDir);
- }
-
- //if no javaSrcDir provided use default
- if(javaSrcDir != null) {
- facetModel.setStringProperty(IWebFacetInstallDataModelProperties.SOURCE_FOLDER, javaSrcDir);
- }
-
-
- facetModel.setBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, createDD);
-
- IDataModel javaFacetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.JAVA);
- javaFacetModel.setProperty(IFacetDataModelProperties.FACET_VERSION, JavaEEFacetConstants.JAVA_5);
-
-
- return dm;
- }
-
-
-
- /**
- * Creates and returns an EAR Data Model with the given name and of the given version
- *
- * Example of how to use this method:
- * public void testEAR12_WithDependencies() throws Exception{
- * IDataModel dm = getEARDataModel("zEAR", null, getJ2EEDependencyList_12(), getJavaDependencyList_12(), JavaEEFacetConstants.EAR_12, true);
- * OperationTestCase.runAndVerify(dm);
- * }
- * @param projName name of the project to create
- * @param version version of EAR to use
- * @param contentDir directory to store the content in, if NULL use default
- * @param dependenciesJ2EE list of J2EE IProjects that this EAR depends on, ignored if NULL
- * @param dependenciesJava list of Java IProjects that this EAR depends on, ignored if NULL
- * @param createDD only used if version is JEE5, if true then create DD else don't
- * @return an EAR Data Model with the appropriate properties set
- */
- public static IDataModel getEARDataModel(String projName, String contentDir, List dependenciesJ2EE, List dependenciesJava, IProjectFacetVersion version, boolean createDD) {
- IDataModel dm = DataModelFactory.createDataModel(new EARFacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projName);
-
- FacetDataModelMap factMap = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel facetModel = (IDataModel) factMap.get(IEarFacetInstallDataModelProperties.ENTERPRISE_APPLICATION);
- facetModel.setProperty(IFacetInstallDataModelProperties.FACET_VERSION, version);
-
-
- if(contentDir != null) {
- facetModel.setStringProperty(IEarFacetInstallDataModelProperties.CONTENT_DIR,contentDir);
- }
-
- if(dependenciesJ2EE != null) {
- facetModel.setProperty(IEarFacetInstallDataModelProperties.J2EE_PROJECTS_LIST, dependenciesJ2EE);
- }
-
- if(dependenciesJava != null) {
- facetModel.setProperty(IEarFacetInstallDataModelProperties.JAVA_PROJECT_LIST, dependenciesJava);
- }
-
-
- facetModel.setBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, createDD);
-
-
- return dm;
- }
-
-
-
- public static List getJ2EEDependencyList_12() throws Exception {
- List dependencies = new ArrayList();
- List<IDataModel> models = new ArrayList<IDataModel>();
-
- models.add(getAppClientCreationDataModel(APP_CLIENT_PROJ_12, null, JavaEEFacetConstants.APP_CLIENT_12, true, true));
-
- models.add(getEJBDataModel(EJB_PROJ_11, null, null, null, JavaEEFacetConstants.EJB_11, true));
-
- models.add(getWebDataModel(WEB_PROJ_22, null, null, null, null, JavaEEFacetConstants.WEB_22, true));
-
- for(int i = 0; i < models.size(); i++) {
- OperationTestCase.runDataModel(models.get(i));
- }
-
- dependencies.addAll(Arrays.asList(JavaEEProjectUtilities.getAllProjects()));
-
- return dependencies;
- }
-
- public static List getJavaDependencyList_12() {
- return Collections.emptyList();
- }
-
-
- public static List getJ2EEDependencyList_13() throws Exception {
- getJ2EEDependencyList_12();
- List dependencies = new ArrayList();
- List<IDataModel> models = new ArrayList<IDataModel>();
-
- models.add(getAppClientCreationDataModel(APP_CLIENT_PROJ_13, null, JavaEEFacetConstants.APP_CLIENT_13, true, true));
-
- models.add(getEJBDataModel(EJB_PROJ_2, null, null, null, JavaEEFacetConstants.EJB_2, true));
-
- models.add(getWebDataModel(WEB_PROJ_23, null, null, null, null, JavaEEFacetConstants.WEB_23, true));
-
- models.add(getConnectorDataModel(CONNECTOR_PROJ_1, null, null, JavaEEFacetConstants.CONNECTOR_1));
-
- for(int i = 0; i < models.size(); i++) {
- OperationTestCase.runDataModel(models.get(i));
- }
-
- dependencies.addAll(Arrays.asList(JavaEEProjectUtilities.getAllProjects()));
-
- return dependencies;
- }
-
- public static List getJavaDependencyList_13() {
- return Collections.emptyList();
- }
-
-
- public static List getJ2EEDependencyList_14() throws Exception {
- getJ2EEDependencyList_13();
- List dependencies = new ArrayList();
-
- List<IDataModel> models = new ArrayList<IDataModel>();
-
- models.add(getAppClientCreationDataModel(APP_CLIENT_PROJ_14, null, JavaEEFacetConstants.APP_CLIENT_14, true, true));
-
- models.add(getEJBDataModel(EJB_PROJ_21, null, null, null, JavaEEFacetConstants.EJB_21, true));
-
- models.add(getWebDataModel(WEB_PROJ_24, null, null, null, null, JavaEEFacetConstants.WEB_24, true));
-
- for(int i = 0; i < models.size(); i++) {
- OperationTestCase.runDataModel(models.get(i));
- }
-
- dependencies.addAll(Arrays.asList(JavaEEProjectUtilities.getAllProjects()));
-
- return dependencies;
- }
-
- public static List getJavaDependencyList_14() {
- return Collections.emptyList();
- }
-
- public static List getJ2EEDependencyList_5() throws Exception {
- getJ2EEDependencyList_14();
- List dependencies = new ArrayList();
-
- List<IDataModel> models = new ArrayList<IDataModel>();
-
- models.add(getAppClientCreationDataModel(APP_CLIENT_PROJ_5, null, JavaEEFacetConstants.APP_CLIENT_5, true, false));
- models.add(getAppClientCreationDataModel(APP_CLIENT_PROJ_5 + "_WithDD", null, JavaEEFacetConstants.APP_CLIENT_5, true, true));
-
- models.add(getEJBDataModel(EJB_PROJ_3, null, null, null, JavaEEFacetConstants.EJB_3, false));
- models.add(getEJBDataModel(EJB_PROJ_3 + "_WithDD", null, null, null, JavaEEFacetConstants.EJB_3, true));
-
- models.add(getWebDataModel(WEB_PROJ_25, null, null, null, null, JavaEEFacetConstants.WEB_25, false));
- models.add(getWebDataModel(WEB_PROJ_25 + "_WithDD", null, null, null, null, JavaEEFacetConstants.WEB_25, true));
-
- for(int i = 0; i < models.size(); i++) {
- OperationTestCase.runDataModel(models.get(i));
- }
-
- dependencies.addAll(Arrays.asList(JavaEEProjectUtilities.getAllProjects()));
-
- return dependencies;
- }
-
- public static List getJavaDependencyList_5() {
- return Collections.emptyList();
- }
-
}
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r42679 - in trunk: cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core and 26 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-07-23 18:33:19 -0400 (Mon, 23 Jul 2012)
New Revision: 42679
Added:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/xpl/
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/xpl/ImageDescriptorRegistry.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/ca/BeansXmlProcessor.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddNameMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllOtherAnnotationsFromParametersMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java
trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/HierarchyInformationControl.java
trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIPlugin.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/TextProposal.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/el/JSF2ElResolver.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFELCompletionEngine.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ActionProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/CSSClassProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ConverterIDProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/EnumerationProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FaceletsJsfCProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FacetNameProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/IDProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourceBundleNameProposalType.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourcePathProposalType.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
Log:
https://issues.jboss.org/browse/JBIDE-12353 Deadlock when invoking code completion
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2012-07-23 22:33:19 UTC (rev 42679)
@@ -28,7 +28,8 @@
org.jboss.tools.jst.web,
org.jboss.tools.common.validation,
org.jboss.tools.cdi.xml;visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="3.7.0"
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.jboss.tools.common.ui
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIImages.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -18,6 +18,7 @@
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.cdi.internal.core.impl.EventBean;
import org.jboss.tools.cdi.xml.CDIXMLImages;
+import org.jboss.tools.common.ui.CommonUIPlugin;
public class CDIImages {
@@ -31,28 +32,32 @@
}
}
- public static final Image CDI_BEAN_IMAGE = getImage("search/cdi_bean.gif"); //$NON-NLS-1$
- public static final Image WELD_IMAGE = getImage("search/weld_icon_16x.gif"); //$NON-NLS-1$
+ public static final ImageDescriptor CDI_BEAN_IMAGE = getImageDescriptor("search/cdi_bean.gif"); //$NON-NLS-1$
+ public static final ImageDescriptor WELD_IMAGE = getImageDescriptor("search/weld_icon_16x.gif"); //$NON-NLS-1$
- public static final Image BEAN_CLASS_IMAGE = CDIXMLImages.BEAN_CLASS_IMAGE;
- public static final Image BEAN_METHOD_IMAGE = getImage("bean_method.png"); //$NON-NLS-1$
- public static final Image BEAN_FIELD_IMAGE = getImage("bean_field.png"); //$NON-NLS-1$
- public static final Image INJECTION_POINT_IMAGE = getImage("injection_point.png"); //$NON-NLS-1$
- public static final Image ANNOTATION_IMAGE = CDIXMLImages.ANNOTATION_IMAGE;
- public static final Image CDI_EVENT_IMAGE = getImage("event.png"); //$NON-NLS-1$
+ public static final ImageDescriptor BEAN_CLASS_IMAGE = CDIXMLImages.BEAN_CLASS_IMAGE;
+ public static final ImageDescriptor BEAN_METHOD_IMAGE = getImageDescriptor("bean_method.png"); //$NON-NLS-1$
+ public static final ImageDescriptor BEAN_FIELD_IMAGE = getImageDescriptor("bean_field.png"); //$NON-NLS-1$
+ public static final ImageDescriptor INJECTION_POINT_IMAGE = getImageDescriptor("injection_point.png"); //$NON-NLS-1$
+ public static final ImageDescriptor ANNOTATION_IMAGE = CDIXMLImages.ANNOTATION_IMAGE;
+ public static final ImageDescriptor CDI_EVENT_IMAGE = getImageDescriptor("event.png"); //$NON-NLS-1$
- public static final Image MESSAGE_BUNDLE_IMAGE = getImage("message_bundle.gif"); //$NON-NLS-1$
+ public static final ImageDescriptor MESSAGE_BUNDLE_IMAGE = getImageDescriptor("message_bundle.gif"); //$NON-NLS-1$
- public static final Image QUICKFIX_ADD = getImage("quickfixes/cdi_add.png"); //$NON-NLS-1$
- public static final Image QUICKFIX_REMOVE = getImage("quickfixes/cdi_remove.png"); //$NON-NLS-1$
- public static final Image QUICKFIX_EDIT = getImage("quickfixes/cdi_edit.png"); //$NON-NLS-1$
- public static final Image QUICKFIX_CHANGE = getImage("quickfixes/cdi_change.png"); //$NON-NLS-1$
+ public static final ImageDescriptor QUICKFIX_ADD = getImageDescriptor("quickfixes/cdi_add.png"); //$NON-NLS-1$
+ public static final ImageDescriptor QUICKFIX_REMOVE = getImageDescriptor("quickfixes/cdi_remove.png"); //$NON-NLS-1$
+ public static final ImageDescriptor QUICKFIX_EDIT = getImageDescriptor("quickfixes/cdi_edit.png"); //$NON-NLS-1$
+ public static final ImageDescriptor QUICKFIX_CHANGE = getImageDescriptor("quickfixes/cdi_change.png"); //$NON-NLS-1$
public static final String CDI_PROJECT_IMAGE = "wizard/CDIProjectWizBan.png"; //$NON-NLS-1$
public static final String CDI_BEANS_XML_IMAGE = "wizard/CDIBeansXMLWizBan.png"; //$NON-NLS-1$
public static final String CDI_CLASS_IMAGE = "wizard/CDIClassWizBan.png"; //$NON-NLS-1$
public static final String CDI_ANNOTATION_IMAGE = "wizard/CDIAnnotationWizBan.png"; //$NON-NLS-1$
+ public static Image getImage(ImageDescriptor descriptor) {
+ return CommonUIPlugin.getImageDescriptorRegistry().get(descriptor);
+ }
+
public static Image getImage(String key) {
return INSTANCE.createImageDescriptor(key).createImage();
}
@@ -102,8 +107,12 @@
if (name == null) throw new MalformedURLException(CDICoreMessages.CDI_IMAGESIMAGE_NAME_CANNOT_BE_NULL);
return new URL(baseUrl, name);
}
-
- public static Image getImageByElement(ICDIElement element){
+
+ public static Image getImageByElement(ICDIElement element) {
+ return getImage(getImageDescriptorByElement(element));
+ }
+
+ public static ImageDescriptor getImageDescriptorByElement(ICDIElement element) {
if(element instanceof IClassBean){
return BEAN_CLASS_IMAGE;
}else if(element instanceof IInjectionPoint){
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/ca/BeansXmlProcessor.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/ca/BeansXmlProcessor.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/ca/BeansXmlProcessor.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -16,8 +16,8 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.ui.JavaPluginImages;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
@@ -95,7 +95,7 @@
for (IBean bean : alternatives) {
if(bean instanceof IClassBean) {
IType type = bean.getBeanClass();
- addMatchedType(type, value, proposals, CDIImages.getImageByElement(bean));
+ addMatchedType(type, value, proposals, CDIImages.getImageDescriptorByElement(bean));
}
}
return proposals.toArray(new TextProposal[0]);
@@ -108,7 +108,7 @@
for (IStereotype stereotype : alternatives) {
if(stereotype.isAlternative()) {
IType type = stereotype.getSourceType();
- addMatchedType(type, value, proposals, CDIImages.getImageByElement(stereotype));
+ addMatchedType(type, value, proposals, CDIImages.getImageDescriptorByElement(stereotype));
}
}
return proposals.toArray(new TextProposal[0]);
@@ -120,7 +120,7 @@
IDecorator[] decorators = cdiProject.getDecorators();
for (IDecorator bean : decorators) {
IType type = bean.getBeanClass();
- addMatchedType(type, value, proposals, CDIImages.getImageByElement(bean));
+ addMatchedType(type, value, proposals, CDIImages.getImageDescriptorByElement(bean));
}
return proposals.toArray(new TextProposal[0]);
}
@@ -131,7 +131,7 @@
IInterceptor[] interceptors = cdiProject.getInterceptors();
for (IInterceptor bean : interceptors) {
IType type = bean.getBeanClass();
- addMatchedType(type, value, proposals, CDIImages.getImageByElement(bean));
+ addMatchedType(type, value, proposals, CDIImages.getImageDescriptorByElement(bean));
}
return proposals.toArray(new TextProposal[0]);
}
@@ -146,7 +146,7 @@
return (st > 0) ? value.substring(st) : value;
}
- private void addMatchedType(IType type, String value, List<TextProposal> proposals, Image image) {
+ private void addMatchedType(IType type, String value, List<TextProposal> proposals, ImageDescriptor image) {
String fullTypeName = type.getFullyQualifiedName();
if(fullTypeName.startsWith(value)) {
TextProposal proposal = new TextProposal();
@@ -155,7 +155,7 @@
// proposal.setLabel(fullTypeName);
proposal.setReplacementString(fullTypeName);
proposal.setPosition(fullTypeName.length());
- proposal.setImage(image);
+ proposal.setImageDescriptor(image);
proposals.add(proposal);
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -19,13 +19,12 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.CDIImages;
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IBean;
-import org.jboss.tools.cdi.core.IBeanManager;
import org.jboss.tools.cdi.core.IBeanMember;
import org.jboss.tools.cdi.core.ICDIProject;
import org.jboss.tools.cdi.core.IClassBean;
@@ -54,7 +53,7 @@
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImageForMember(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo)
*/
@Override
- public Image getELProposalImageForMember(MemberInfo memberInfo) {
+ public ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo) {
return (memberInfo instanceof TypeInfoCollector.FieldInfo)?CDIImages.BEAN_FIELD_IMAGE:CDIImages.BEAN_METHOD_IMAGE;
}
@@ -63,7 +62,7 @@
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImage(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberPresentation)
*/
@Override
- protected Image getELProposalImage(MemberPresentation memberPresentation) {
+ protected ImageDescriptor getELProposalImage(MemberPresentation memberPresentation) {
return memberPresentation.isProperty()?CDIImages.BEAN_FIELD_IMAGE:CDIImages.BEAN_METHOD_IMAGE;
}
@@ -73,7 +72,7 @@
*/
@Override
protected void setImage(TextProposal kbProposal, IBean var) {
- kbProposal.setImage(CDIImages.getImageByElement(var));
+ kbProposal.setImageDescriptor(CDIImages.getImageDescriptorByElement(var));
}
/* (non-Javadoc)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/el/CDIInternationalMessagesELResolver.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -22,9 +22,9 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.CDIImages;
@@ -76,7 +76,7 @@
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImageForMember(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo)
*/
@Override
- public Image getELProposalImageForMember(MemberInfo memberInfo) {
+ public ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo) {
return CDIImages.MESSAGE_BUNDLE_IMAGE;
}
@@ -301,7 +301,7 @@
if(varName.startsWith(operand.getText())) {
TextProposal proposal = new TextProposal();
proposal.setReplacementString(varName.substring(operand.getLength()));
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
proposals.add(proposal);
}
}
@@ -324,7 +324,7 @@
proposal.setReplacementString(varName.substring(operand.getLength()));
proposal.setLabel(varName);
proposal.setPropertyName(null); // Since it's not a property
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
List<XModelObject> objects = new ArrayList<XModelObject>();
IBundleModel bundleModel = BundleModelFactory.getBundleModel(var.f.getProject());
@@ -343,7 +343,7 @@
TextProposal proposal = new TextProposal();
proposal.setReplacementString(varName);
proposal.setLabel(varName);
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
proposals.add(proposal);
}
resolution.getLastSegment().getVariables().add(var);
@@ -435,7 +435,7 @@
MessagesELTextProposal kbProposal = createProposal(mbr, key);
if (key.indexOf('.') == -1) kbProposal.setReplacementString(key.substring(filter.length()));
else kbProposal.setReplacementString('[' + kbProposal.getReplacementString());
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
kbProposals.add(kbProposal);
}
}
@@ -582,7 +582,7 @@
kbProposal.setLabel(proposal);
}
kbProposal.setAlternateMatch(proposal);
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
List<XModelObject> objects = new ArrayList<XModelObject>();
IBundleModel bundleModel = BundleModelFactory.getBundleModel(mbr.f.getProject());
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -169,17 +169,20 @@
}
}
+ @Override
protected Control createTitleMenuArea(Composite parent) {
Composite fViewMenuButtonComposite= (Composite) super.createTitleMenuArea(parent);
fFilterText = createFilterText(parent);
return fViewMenuButtonComposite;
}
+ @Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
newShell.setText(CDIExtensionsMessages.ASSIGNABLE_BEANS_DIALOG_TITLE);
}
+ @Override
protected Control createDialogArea(Composite parent) {
composite = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(2, false);
@@ -230,6 +233,7 @@
// PopupDialog
list.getTable().addMouseMoveListener(new MouseMoveListener() {
+ @Override
public void mouseMove(MouseEvent e) {
ViewerCell cell = list.getCell(new Point(e.x, e.y));
if(cell != null) {
@@ -242,6 +246,7 @@
}
});
list.getTable().addMouseListener(new MouseAdapter() {
+ @Override
public void mouseUp(MouseEvent e) {
gotoSelectedElement();
}
@@ -297,6 +302,7 @@
});
}
+ @Override
protected Control getFocusControl() {
return getFilterText();
}
@@ -315,6 +321,7 @@
fFilterText.setLayoutData(data);
fFilterText.addKeyListener(new KeyListener() {
+ @Override
public void keyPressed(KeyEvent e) {
if (e.keyCode == 0x0D) // return
gotoSelectedElement();
@@ -325,6 +332,7 @@
if (e.character == 0x1B) // ESC
close();
}
+ @Override
public void keyReleased(KeyEvent e) {
// do nothing
}
@@ -336,6 +344,7 @@
fFilterText.setText(""); //$NON-NLS-1$
fFilterText.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
list.refresh();
}
@@ -346,10 +355,12 @@
return AssignableBeansDialog.class.getName();
}
+ @Override
protected Point getDefaultSize() {
return new Point(700, 400);
}
+ @Override
protected Point getDefaultLocation(Point size) {
Display display = Display.getCurrent();
if(display == null) {
@@ -365,10 +376,13 @@
}
// PopupDialog
+ @Override
protected void fillDialogMenu(IMenuManager dialogMenu) {
super.fillDialogMenu(dialogMenu);
dialogMenu.add(new ShowHideAction());
}
+
+ @Override
protected IDialogSettings getDialogSettings() {
IDialogSettings settings = CDIExtensionsPlugin.getDefault().getDialogSettings().getSection(getId());
if(settings == null && filters != null && injectionPoint != null) {
@@ -381,6 +395,7 @@
return settings;
}
+ @Override
public boolean close() {
saveFilterOptions();
return super.close();
@@ -435,6 +450,7 @@
super("Show/Hide panel", Action.AS_CHECK_BOX);
setChecked(showHideOptions);
}
+ @Override
public void run() {
setFiltersEnabled(isChecked());
}
@@ -587,6 +603,7 @@
this.bold = bold;
}
+ @Override
public void applyStyles(TextStyle textStyle) {
if (foreground != null) {
textStyle.foreground = foreground;
@@ -601,6 +618,7 @@
}
class LP extends StyledCellLabelProvider implements DelegatingStyledCellLabelProvider.IStyledLabelProvider {
+ @Override
public void update(ViewerCell cell) {
ELIGIBLE_QUALIFIER = DISABLED;
Object element = cell.getElement();
@@ -615,6 +633,8 @@
public String getText(Object element) {
return getStyledText(element).getString();
}
+
+ @Override
public StyledString getStyledText(Object element) {
IBean b = (IBean)element;
RESOLVED_NAME = new DefaultStyler(black, true, false);
@@ -636,8 +656,9 @@
return sb;
}
+ @Override
public Image getImage(Object element) {
return CDIImages.getImageByElement((ICDIElement)element);
}
}
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -32,6 +32,7 @@
super(parent, title, shellStyle, tableStyle, hyperlinks);
}
+ @Override
protected BeanTableLabelProvider createTableLableProvider() {
return new BeanTableLabelProvider2();
}
@@ -40,7 +41,8 @@
protected String getId() {
return "org.jboss.tools.cdi.text.ext.InformationControl";
}
-
+
+ @Override
protected boolean select2(SearchPattern patternMatcher, Object element) {
if (element instanceof IInformationItem) {
String name = ((IInformationItem)element).getCDIElement().getElementName();
@@ -55,6 +57,7 @@
}
class BeanTableLabelProvider2 extends BeanTableLabelProvider {
+ @Override
public void update(ViewerCell cell) {
Object element = cell.getElement();
StyledString styledString = getStyledText(element);
@@ -65,9 +68,12 @@
super.update(cell);
}
+ @Override
public String getText(Object element) {
return getStyledText(element).getString();
}
+
+ @Override
public StyledString getStyledText(Object element) {
StyledString sb = new StyledString();
if(element instanceof IHyperlink){
@@ -84,6 +90,7 @@
return sb;
}
+ @Override
public Image getImage(Object element) {
if(element instanceof IInformationItem){
ICDIElement cdiElement = ((IInformationItem)element).getCDIElement();
@@ -92,5 +99,4 @@
return null;
}
}
-}
-
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -11,8 +11,6 @@
package org.jboss.tools.cdi.ui.ca;
import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.jdom.IDOMNode;
-import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
@@ -29,6 +27,7 @@
import org.jboss.tools.cdi.internal.core.ca.BeansXmlProcessor;
import org.jboss.tools.common.el.core.resolver.ELContext;
import org.jboss.tools.common.text.TextProposal;
+import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
import org.jboss.tools.jst.jsp.contentassist.computers.XmlTagCompletionProposalComputer;
import org.jboss.tools.jst.web.kb.KbQuery;
@@ -106,7 +105,7 @@
int replacementOffset = contentAssistRequest.getReplacementBeginPosition() - matchString.length();
int replacementLength = matchString.length();
int cursorPosition = getCursorPositionForProposedText(replacementString);
- Image image = textProposal.getImage();
+ Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
if (image == null) {
image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -79,9 +79,8 @@
return change;
}
-
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_ADD;
+ return CDIImages.getImage(CDIImages.QUICKFIX_ADD);
}
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -91,7 +91,6 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_ADD;
+ return CDIImages.getImage(CDIImages.QUICKFIX_ADD);
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddNameMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddNameMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddNameMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -24,6 +24,6 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_ADD;
+ return CDIImages.getImage(CDIImages.QUICKFIX_ADD);
}
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -50,9 +50,9 @@
}
return change;
}
-
+
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_ADD;
+ return CDIImages.getImage(CDIImages.QUICKFIX_ADD);
}
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -29,9 +29,9 @@
*/
public class AddSerializableInterfaceMarkerResolution extends BaseMarkerResolution {
public static final String SERIALIZABLE = "java.io.Serializable"; //$NON-NLS-1$
-
+
private IType type;
-
+
public AddSerializableInterfaceMarkerResolution(IType type){
super(type.getCompilationUnit());
this.label = MessageFormat.format(CDIUIMessages.ADD_SERIALIZABLE_INTERFACE_MARKER_RESOLUTION_TITLE, new Object[]{type.getElementName()});
@@ -42,22 +42,21 @@
@Override
protected CompilationUnitChange getChange(ICompilationUnit compilationUnit){
CompilationUnitChange change = new CompilationUnitChange("", compilationUnit);
-
+
MultiTextEdit edit = new MultiTextEdit();
-
+
change.setEdit(edit);
try{
CDIMarkerResolutionUtils.addInterfaceToClass(compilationUnit, type, SERIALIZABLE, edit);
} catch (JavaModelException e) {
CDIUIPlugin.getDefault().logError(e);
}
-
+
return change;
}
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_ADD;
+ return CDIImages.getImage(CDIImages.QUICKFIX_ADD);
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -60,9 +60,9 @@
return change;
}
-
+
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_ADD;
+ return CDIImages.getImage(CDIImages.QUICKFIX_ADD);
}
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -107,6 +107,6 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_CHANGE;
+ return CDIImages.getImage(CDIImages.QUICKFIX_CHANGE);
}
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -123,7 +123,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_EDIT;
+ return CDIImages.getImage(CDIImages.QUICKFIX_EDIT);
}
@Override
@@ -155,6 +155,4 @@
public IContextInformation getContextInformation() {
return null;
}
-
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -114,7 +114,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_REMOVE;
+ return CDIImages.getImage(CDIImages.QUICKFIX_REMOVE);
}
@Override
@@ -146,5 +146,4 @@
public IContextInformation getContextInformation() {
return null;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -123,7 +123,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_REMOVE;
+ return CDIImages.getImage(CDIImages.QUICKFIX_REMOVE);
}
@Override
@@ -155,5 +155,4 @@
public IContextInformation getContextInformation() {
return null;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllOtherAnnotationsFromParametersMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllOtherAnnotationsFromParametersMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllOtherAnnotationsFromParametersMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -112,7 +112,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_REMOVE;
+ return CDIImages.getImage(CDIImages.QUICKFIX_REMOVE);
}
@Override
@@ -144,5 +144,4 @@
public IContextInformation getContextInformation() {
return null;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -80,6 +80,6 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_REMOVE;
+ return CDIImages.getImage(CDIImages.QUICKFIX_REMOVE);
}
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -116,7 +116,6 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_EDIT;
+ return CDIImages.getImage(CDIImages.QUICKFIX_EDIT);
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -162,7 +162,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_EDIT;
+ return CDIImages.getImage(CDIImages.QUICKFIX_EDIT);
}
@Override
@@ -194,4 +194,4 @@
public IContextInformation getContextInformation() {
return null;
}
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -83,7 +83,6 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_EDIT;
+ return CDIImages.getImage(CDIImages.QUICKFIX_EDIT);
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -36,7 +36,7 @@
private IInjectionPoint injectionPoint;
private List<IBean> beans;
private IBean selectedBean;
-
+
public MakeInjectedPointUnambiguousMarkerResolution(IInjectionPoint injectionPoint, List<IBean> beans, int index){
this.injectionPoint = injectionPoint;
this.beans = beans;
@@ -48,12 +48,12 @@
public String getLabel() {
return label;
}
-
+
@Override
public void runForTest(IMarker marker){
internal_run(true);
}
-
+
@Override
public void run(IMarker marker) {
internal_run(false);
@@ -65,7 +65,7 @@
AddQualifiersToBeanWizard wizard = new AddQualifiersToBeanWizard(refactoring);
wizard.showWizard();
}
-
+
@Override
public String getDescription() {
return label;
@@ -73,7 +73,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_EDIT;
+ return CDIImages.getImage(CDIImages.QUICKFIX_EDIT);
}
@Override
@@ -105,5 +105,4 @@
public IContextInformation getContextInformation() {
return null;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -163,7 +163,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_ADD;
+ return CDIImages.getImage(CDIImages.QUICKFIX_ADD);
}
@Override
@@ -195,5 +195,4 @@
public IContextInformation getContextInformation() {
return null;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -34,7 +34,7 @@
*/
public class MakeMethodPublicMarkerResolution extends BaseMarkerResolution {
private IMethod method;
-
+
public MakeMethodPublicMarkerResolution(IMethod method){
super(CDIMarkerResolutionUtils.getJavaMember(method).getCompilationUnit());
this.label = MessageFormat.format(CDIUIMessages.MAKE_METHOD_PUBLIC_MARKER_RESOLUTION_TITLE, new Object[]{method.getElementName()});
@@ -45,20 +45,20 @@
@Override
protected CompilationUnitChange getChange(ICompilationUnit compilationUnit){
CompilationUnitChange change = new CompilationUnitChange("", compilationUnit);
-
+
MultiTextEdit edit = new MultiTextEdit();
-
+
change.setEdit(edit);
-
+
try{
IBuffer buffer = compilationUnit.getBuffer();
-
+
IMethod workingCopyMethod = CDIMarkerResolutionUtils.findWorkingCopy(compilationUnit, method);
if(workingCopyMethod != null){
int flag = workingCopyMethod.getFlags();
-
+
String text = buffer.getText(workingCopyMethod.getSourceRange().getOffset(), workingCopyMethod.getSourceRange().getLength());
-
+
// make method public
int position = workingCopyMethod.getSourceRange().getOffset();
if(!Flags.isPublic(flag)){
@@ -83,9 +83,9 @@
}
return change;
}
-
+
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_EDIT;
+ return CDIImages.getImage(CDIImages.QUICKFIX_EDIT);
}
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -34,7 +34,7 @@
private String label;
private IInjectionPoint injectionPoint;
private List<IBean> beans;
-
+
public SelectBeanMarkerResolution(IInjectionPoint injectionPoint, List<IBean> beans){
this.injectionPoint = injectionPoint;
this.label = CDIUIMessages.SELECT_BEAN_TITLE;
@@ -50,7 +50,7 @@
public void runForTest(IMarker marker){
internal_run(true);
}
-
+
@Override
public void run(IMarker marker) {
internal_run(false);
@@ -62,7 +62,7 @@
SelectBeanWizard wizard = new SelectBeanWizard(refactoring);
wizard.showWizard();
}
-
+
@Override
public String getDescription() {
return label;
@@ -70,7 +70,7 @@
@Override
public Image getImage() {
- return CDIImages.QUICKFIX_EDIT;
+ return CDIImages.getImage(CDIImages.QUICKFIX_EDIT);
}
@Override
@@ -102,4 +102,4 @@
public IContextInformation getContextInformation() {
return null;
}
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -178,7 +178,7 @@
if(element instanceof CDIElementWrapper){
return CDIImages.getImageByElement(((CDIElementWrapper)element).getCDIElement());
}
- return CDIImages.WELD_IMAGE;
+ return CDIImages.getImage(CDIImages.WELD_IMAGE);
}
@Override
@@ -193,9 +193,6 @@
return text+cdiElement.getElementName()+BeanPresentationUtil.getCDIElementLocation(cdiElement, false);
}
return ""; //$NON-NLS-1$
-
}
-
}
-
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -19,13 +19,15 @@
public class InjectionPointLabelProvider implements ILabelProvider {
+ @Override
public Image getImage(Object element) {
if(element instanceof CDIElementWrapper){
return CDIImages.getImageByElement(((CDIElementWrapper)element).getCDIElement());
}
- return CDIImages.WELD_IMAGE;
+ return CDIImages.getImage(CDIImages.WELD_IMAGE);
}
+ @Override
public String getText(Object element) {
if(element instanceof CDIElementWrapper){
ICDIElement cdiElement = ((CDIElementWrapper)element).getCDIElement();
@@ -39,16 +41,20 @@
return ""; //$NON-NLS-1$
}
+ @Override
public void addListener(ILabelProviderListener listener) {
}
+ @Override
public void dispose() {
}
+ @Override
public boolean isLabelProperty(Object element, String property) {
return false;
}
+ @Override
public void removeListener(ILabelProviderListener listener) {
}
-}
+}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/CDIXMLImages.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -29,8 +29,8 @@
}
}
- public static final Image BEAN_CLASS_IMAGE = getImage("bean_class.png"); //$NON-NLS-1$
- public static final Image ANNOTATION_IMAGE = getImage("annotation.png"); //$NON-NLS-1$
+ public static final ImageDescriptor BEAN_CLASS_IMAGE = getImageDescriptor("bean_class.png"); //$NON-NLS-1$
+ public static final ImageDescriptor ANNOTATION_IMAGE = getImageDescriptor("annotation.png"); //$NON-NLS-1$
public static Image getImage(String key) {
return INSTANCE.createImageDescriptor(key).createImage();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDIImagesTest.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -12,7 +12,7 @@
import junit.framework.TestCase;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.cdi.core.CDIImages;
import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.internal.core.impl.BeanField;
@@ -32,7 +32,7 @@
public void checkImageForCDIElement(ICDIElement element){
assertNotNull("CDI Element must be not null", element);
- Image image = CDIImages.getImageByElement(element);
+ ImageDescriptor image = CDIImages.getImageDescriptorByElement(element);
assertNotNull("Icon image for CDI element - "+element.getClass()+" not loaded", image);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -13,10 +13,10 @@
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.cdi.core.CDIImages;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
+import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
/**
@@ -28,9 +28,10 @@
private ContentAssistantTestCase caTest = new ContentAssistantTestCase();
private static final String PAGE_NAME = "WebContent/test.jsp";
private String[] beanProposals = new String[] {"example", "example.com", "fishJBT", "game", "haddock", "salmon", "sheep", "tunaFarm", "whitefishJBT", "wolf"};
- private Image[] beanImages = new Image[] {CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE, CDIImages.BEAN_CLASS_IMAGE};
+ Image beanClassImage = CommonUIPlugin.getImageDescriptorRegistry().get(CDIImages.BEAN_CLASS_IMAGE);
+ private Image[] beanImages = new Image[] {beanClassImage, beanClassImage, beanClassImage, beanClassImage, beanClassImage, beanClassImage, beanClassImage, beanClassImage, beanClassImage, beanClassImage};
private String[] propertyProposals = new String[] {"game.value", "game.initialize()"};
- private Image[] propertyImages = new Image[] {CDIImages.BEAN_FIELD_IMAGE, CDIImages.BEAN_METHOD_IMAGE};
+ private Image[] propertyImages = new Image[] {CommonUIPlugin.getImageDescriptorRegistry().get(CDIImages.BEAN_FIELD_IMAGE), CommonUIPlugin.getImageDescriptorRegistry().get(CDIImages.BEAN_METHOD_IMAGE)};
public void setUp() {
project = TCKTest.findTestProject();
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/TextProposal.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/TextProposal.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/text/TextProposal.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -12,7 +12,7 @@
import java.util.Comparator;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
/**
* Text Proposal for Content Assist.
@@ -39,7 +39,7 @@
private Object source;
private String label;
private String contextInfo;
- private Image image;
+ private ImageDescriptor imageDescriptor;
private boolean emptyImage = true;
private String replacementString;
private String alternateMatch = null;
@@ -65,7 +65,7 @@
newObject.source = this.source;
newObject.label = this.label;
newObject.contextInfo = this.contextInfo;
- newObject.image = this.image;
+ newObject.imageDescriptor = this.imageDescriptor;
newObject.emptyImage = this.emptyImage;
newObject.replacementString = this.replacementString;
newObject.emptyContextInfo = this.emptyContextInfo;
@@ -121,10 +121,11 @@
/**
* @return
*/
- public Image getImage() {
- return image;
+ public ImageDescriptor getImageDescriptor() {
+ return imageDescriptor;
}
+// CommonUIPlugin.getImageDescriptorRegistry().get
/**
* @return
*/
@@ -164,9 +165,9 @@
/**
* @param string
*/
- public void setImage(Image img) {
- this.image = img;
- if(this.image != null) {
+ public void setImageDescriptor(ImageDescriptor img) {
+ this.imageDescriptor = img;
+ if(this.imageDescriptor != null) {
emptyImage = false;
}
}
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -24,9 +24,9 @@
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.Signature;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.ELReference;
import org.jboss.tools.common.el.core.model.ELArgument;
@@ -75,13 +75,13 @@
public AbstractELCompletionEngine() {}
- protected abstract Image getELProposalImageForMember(MemberInfo memberInfo);
+ protected abstract ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo);
protected abstract void log(Exception e);
private static ELParserFactory defaultFactory = ELParserUtil.getJbossFactory();
- protected Image getELProposalImage(MemberPresentation memberPresentation) {
+ protected ImageDescriptor getELProposalImage(MemberPresentation memberPresentation) {
return getELProposalImageForMember(memberPresentation!=null?memberPresentation.getMember():null);
}
@@ -396,7 +396,7 @@
proposal.setLabel(v.getName());
proposal.setReplacementString(varNameProposal);
proposal.setLabel(v.getName());
- proposal.setImage(getELProposalImageForMember(memberInfo));
+ proposal.setImageDescriptor(getELProposalImageForMember(memberInfo));
proposal.setType(typeName);
proposal.setSourceType(sourceTypeName);
if (jmSegment != null) {
@@ -835,7 +835,7 @@
ELTextProposal proposal = new ELTextProposal();
proposal.setReplacementString(presentationString);
proposal.setLabel(presentationDisplayName);
- proposal.setImage(getELProposalImage(presentation));
+ proposal.setImageDescriptor(getELProposalImage(presentation));
proposal.setType(typeName);
proposal.setSourceType(sourceTypeName);
for (MemberInfo mi : presentation.getAllMembers()) {
@@ -881,7 +881,7 @@
ELTextProposal proposal = new ELTextProposal();
proposal.setReplacementString(presentationString);
proposal.setLabel(presentationDisplayName);
- proposal.setImage(getELProposalImage(presentation));
+ proposal.setImageDescriptor(getELProposalImage(presentation));
proposal.setType(typeName);
proposal.setSourceType(sourceTypeName);
for (MemberInfo mi : presentation.getAllMembers()) {
@@ -986,7 +986,7 @@
ELTextProposal kbProposal = new ELTextProposal();
kbProposal.setReplacementString(proposal.getPresentation().substring(filter.length()));
kbProposal.setLabel(proposal.getPresentationDisplayName());
- kbProposal.setImage(getELProposalImageForMember(proposal.getMember()));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(proposal.getMember()));
kbProposal.setType(typeName);
kbProposal.setSourceType(sourceTypeName);
for (MemberInfo mi : proposal.getAllMembers()) {
@@ -1122,7 +1122,7 @@
kbProposal.setReplacementString(replacementString);
kbProposal.setLabel(proposal.getPresentationDisplayName());
- kbProposal.setImage(getELProposalImageForMember(member));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(member));
kbProposal.setType(typeName);
kbProposal.setSourceType(sourceTypeName);
for (MemberInfo mi : proposal.getAllMembers()) {
@@ -1152,11 +1152,11 @@
}
protected void setImage(TextProposal kbProposal, TypeInfoCollector.MemberPresentation proposal) {
- kbProposal.setImage(getELProposalImage(proposal));
+ kbProposal.setImageDescriptor(getELProposalImage(proposal));
}
protected void setImage(TextProposal kbProposal, V var) {
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
}
/**
Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ca/ELProposalProcessor.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -71,6 +71,7 @@
import org.jboss.tools.common.model.filesystems.impl.JarSystemImpl;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.common.util.EclipseUIUtil;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -612,8 +613,7 @@
for (TextProposal kbProposal : uniqueSuggestions) {
String string = kbProposal.getReplacementString();
- Image image = kbProposal.hasImage() ? kbProposal.getImage()
- : getImage();
+ Image image = kbProposal.hasImage() ? CommonUIPlugin.getImageDescriptorRegistry().get(kbProposal.getImageDescriptor()):getImage();
if (string.length() >= 0) {
string = proposalPrefix + string;
if (string.length() > 0 && ('#' == string.charAt(0) || '$' == string.charAt(0)))
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/HierarchyInformationControl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -114,7 +114,7 @@
protected String getId() {
return "org.jboss.tools.cdi.text.ext.InformationControl";
}
-
+
public static class BeanTableContentProvider implements IStructuredContentProvider{
private IHyperlink[] hyperlinks;
@@ -134,9 +134,8 @@
public Object[] getElements(Object inputElement) {
return hyperlinks;
}
+ }
- }
-
protected boolean select2(SearchPattern patternMatcher, Object element) {
return true;
}
@@ -147,11 +146,11 @@
return true;
}
+ @Override
public boolean select(Viewer viewer, Object parentElement,
Object element) {
return select2(patternMatcher, element);
}
-
}
protected static Color gray = new Color(null, 128, 128, 128);
@@ -159,7 +158,7 @@
protected static Styler NAME_STYLE = new DefaultStyler(black, false);
protected static Styler PACKAGE_STYLE = new DefaultStyler(gray, false);
-
+
private static class DefaultStyler extends Styler {
private final Color foreground;
private final boolean italic;
@@ -169,6 +168,7 @@
this.italic = italic;
}
+ @Override
public void applyStyles(TextStyle textStyle) {
if (foreground != null) {
textStyle.foreground = foreground;
@@ -178,8 +178,9 @@
}
}
}
-
+
protected class BeanTableLabelProvider extends StyledCellLabelProvider implements DelegatingStyledCellLabelProvider.IStyledLabelProvider {
+ @Override
public void update(ViewerCell cell) {
Object element = cell.getElement();
StyledString styledString = getStyledText(element);
@@ -193,6 +194,8 @@
public String getText(Object element) {
return getStyledText(element).getString();
}
+
+ @Override
public StyledString getStyledText(Object element) {
StyledString sb = new StyledString();
if(element instanceof IHyperlink){
@@ -201,9 +204,9 @@
return sb;
}
+ @Override
public Image getImage(Object element) {
return null;
}
}
}
-
Modified: trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/common/plugins/org.jboss.tools.common.ui/META-INF/MANIFEST.MF 2012-07-23 22:33:19 UTC (rev 42679)
@@ -44,7 +44,8 @@
org.jboss.tools.common.ui.ssh,
org.jboss.tools.common.ui.widget.editor,
org.jboss.tools.common.ui.widget.field,
- org.jboss.tools.common.ui.wizard
+ org.jboss.tools.common.ui.wizard,
+ org.jboss.tools.common.ui.xpl
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIPlugin.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIPlugin.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/CommonUIPlugin.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -12,6 +12,7 @@
package org.jboss.tools.common.ui;
import org.jboss.tools.common.log.BaseUIPlugin;
+import org.jboss.tools.common.ui.xpl.ImageDescriptorRegistry;
import org.osgi.framework.BundleContext;
/**
@@ -24,7 +25,9 @@
// The shared instance
private static CommonUIPlugin plugin;
-
+
+ private ImageDescriptorRegistry fImageDescriptorRegistry;
+
/**
* The constructor
*/
@@ -32,6 +35,17 @@
plugin = this;
}
+ public static ImageDescriptorRegistry getImageDescriptorRegistry() {
+ return getDefault().internalGetImageDescriptorRegistry();
+ }
+
+ private synchronized ImageDescriptorRegistry internalGetImageDescriptorRegistry() {
+ if (fImageDescriptorRegistry == null) {
+ fImageDescriptorRegistry= new ImageDescriptorRegistry();
+ }
+ return fImageDescriptorRegistry;
+ }
+
/*
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
Added: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/xpl/ImageDescriptorRegistry.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/xpl/ImageDescriptorRegistry.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/xpl/ImageDescriptorRegistry.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.jboss.tools.common.ui.xpl;
+
+import java.util.HashMap;
+import java.util.Iterator;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * A registry that maps <code>ImageDescriptors</code> to <code>Image</code>.
+ */
+public class ImageDescriptorRegistry {
+
+ private HashMap<ImageDescriptor, Image> fRegistry= new HashMap<ImageDescriptor, Image>(10);
+ private Display fDisplay;
+
+ /**
+ * Creates a new image descriptor registry for the given display. All images
+ * managed by this registry will be disposed when the display gets disposed.
+ */
+ public ImageDescriptorRegistry() {
+ fDisplay= PlatformUI.getWorkbench().getDisplay();
+ Assert.isNotNull(fDisplay);
+ hookDisplay();
+ }
+
+ /**
+ * Returns the image associated with the given image descriptor.
+ *
+ * @param descriptor the image descriptor for which the registry manages an image,
+ * or <code>null</code> for a missing image descriptor
+ * @return the image associated with the image descriptor or <code>null</code>
+ * if the image descriptor can't create the requested image.
+ */
+ public Image get(ImageDescriptor descriptor) {
+ if (descriptor == null)
+ descriptor= ImageDescriptor.getMissingImageDescriptor();
+
+ Image result= fRegistry.get(descriptor);
+ if (result != null)
+ return result;
+
+ result= descriptor.createImage();
+ if (result != null)
+ fRegistry.put(descriptor, result);
+ return result;
+ }
+
+ /**
+ * Disposes all images managed by this registry.
+ */
+ public void dispose() {
+ for (Iterator<Image> iter= fRegistry.values().iterator(); iter.hasNext(); ) {
+ Image image= iter.next();
+ image.dispose();
+ }
+ fRegistry.clear();
+ }
+
+ private void hookDisplay() {
+ fDisplay.disposeExec(new Runnable() {
+ public void run() {
+ dispose();
+ }
+ });
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/xpl/ImageDescriptorRegistry.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/el/JSF2ElResolver.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/el/JSF2ElResolver.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/bean/el/JSF2ElResolver.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -16,7 +16,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
import org.jboss.tools.common.el.core.parser.ELParserFactory;
@@ -36,15 +36,15 @@
private static ELParserFactory factory = ELParserUtil.getJbossFactory();
- public static final Image JSF_EL_PROPOSAL_IMAGE =
- JSFModelPlugin.getDefault().getImage(JSFModelPlugin.CA_JSF_EL_IMAGE_PATH);
+ public static final ImageDescriptor JSF_EL_PROPOSAL_IMAGE =
+ JSFModelPlugin.getDefault().getImageDescriptorFromRegistry(JSFModelPlugin.CA_JSF_EL_IMAGE_PATH);
/*
* (non-Javadoc)
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImageForMember(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo)
*/
@Override
- public Image getELProposalImageForMember(MemberInfo memberInfo) {
+ public ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo) {
return JSF_EL_PROPOSAL_IMAGE;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSF2CCAttrsELCompletionEngine.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -23,6 +23,7 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.swt.graphics.Image;
@@ -64,14 +65,14 @@
*
*/
public class JSF2CCAttrsELCompletionEngine extends AbstractELCompletionEngine<IVariable> {
- private static final Image JSF2_EL_CC_ATTRS_PROPOSAL_IMAGE = JSFModelPlugin.getDefault().getImage(JSFModelPlugin.CA_JSF_MESSAGES_IMAGE_PATH);
+ private static final ImageDescriptor JSF2_EL_CC_ATTRS_PROPOSAL_IMAGE = JSFModelPlugin.getDefault().getImageDescriptorFromRegistry(JSFModelPlugin.CA_JSF_MESSAGES_IMAGE_PATH);
/*
* (non-Javadoc)
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImageForMember(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo)
*/
@Override
- public Image getELProposalImageForMember(MemberInfo memberInfo) {
+ public ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo) {
return JSF2_EL_CC_ATTRS_PROPOSAL_IMAGE;
}
@@ -226,7 +227,7 @@
if(varName.startsWith(operand.getText())) {
TextProposal proposal = new TextProposal();
proposal.setReplacementString(varName.substring(operand.getLength()));
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
proposals.add(proposal);
}
}
@@ -250,13 +251,13 @@
TextProposal proposal = new TextProposal();
proposal.setReplacementString(varName.substring(operand.getLength()));
proposal.setLabel(varName);
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
proposals.add(proposal);
} else if(returnEqualedVariablesOnly) {
TextProposal proposal = new TextProposal();
proposal.setReplacementString(varName);
proposal.setLabel(varName);
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
proposals.add(proposal);
}
segment.getVariables().add(var);
@@ -453,7 +454,7 @@
TextProposal kbProposal = new TextProposal();
kbProposal.setReplacementString(proposal);
kbProposal.setLabel(proposal);
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
kbProposals.add(kbProposal);
@@ -464,7 +465,7 @@
TextProposal kbProposal = new TextProposal();
kbProposal.setReplacementString(proposal.substring(filter.length()));
kbProposal.setLabel(proposal);
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
kbProposals.add(kbProposal);
}
@@ -505,7 +506,7 @@
TextProposal kbProposal = new TextProposal();
kbProposal.setReplacementString(proposal);
kbProposal.setLabel(proposal);
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
kbProposals.add(kbProposal);
@@ -522,7 +523,7 @@
kbProposal.setReplacementString(replacementString);
kbProposal.setLabel(proposal);
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
kbProposals.add(kbProposal);
}
@@ -547,14 +548,14 @@
TextProposal proposal = new TextProposal();
proposal.setReplacementString("['" + key + "']"); //$NON-NLS-1$ //$NON-NLS-2$
proposal.setLabel("['" + key + "']");
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
kbProposals.add(proposal);
} else {
TextProposal proposal = new TextProposal();
proposal.setReplacementString(key);
proposal.setLabel(key);
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
kbProposals.add(proposal);
}
@@ -705,4 +706,4 @@
}
return null;
}
-}
+}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFELCompletionEngine.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFELCompletionEngine.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -19,7 +19,7 @@
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
import org.jboss.tools.common.el.core.parser.ELParserFactory;
@@ -40,7 +40,7 @@
*/
public class JSFELCompletionEngine extends AbstractELCompletionEngine<JSFELCompletionEngine.IJSFVariable> {
- private static final Image JSF_EL_PROPOSAL_IMAGE = JSFModelPlugin.getDefault().getImage(JSFModelPlugin.CA_JSF_EL_IMAGE_PATH);
+ private static final ImageDescriptor JSF_EL_PROPOSAL_IMAGE = JSFModelPlugin.getDefault().getImageDescriptorFromRegistry(JSFModelPlugin.CA_JSF_EL_IMAGE_PATH);
private static ELParserFactory factory = ELParserUtil.getDefaultFactory();
/*
@@ -48,7 +48,7 @@
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImageForMember(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo)
*/
@Override
- public Image getELProposalImageForMember(MemberInfo memberInfo) {
+ public ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo) {
return JSF_EL_PROPOSAL_IMAGE;
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFFuncsELCompletionEngine.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -23,7 +23,6 @@
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.Signature;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
import org.jboss.tools.common.el.core.resolver.ELContext;
@@ -31,7 +30,6 @@
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.ArtificialTypeInfo;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jst.web.kb.PageContextFactory;
import org.jboss.tools.jst.web.kb.internal.XmlContextImpl;
@@ -42,16 +40,7 @@
import org.jboss.tools.jst.web.kb.taglib.TagLibraryManager;
public class JSFFuncsELCompletionEngine extends JSFELCompletionEngine {
- private static final Image JSF_EL_PROPOSAL_IMAGE = JSFModelPlugin.getDefault().getImage(JSFModelPlugin.CA_JSF_EL_IMAGE_PATH);
- /*
- * (non-Javadoc)
- * @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImage()
- */
- public Image getELProposalImage() {
- return JSF_EL_PROPOSAL_IMAGE;
- }
-
public JSFFuncsELCompletionEngine() {}
/*
@@ -142,10 +131,6 @@
return result;
}
- protected void setImage(TextProposal kbProposal) {
- kbProposal.setImage(getELProposalImage());
- }
-
static class Variable implements IJSFVariable {
IFile f;
String name;
@@ -164,6 +149,7 @@
this.funcResolvedMethod = null;
}
+ @Override
public String getName() {
return name;
}
@@ -253,9 +239,10 @@
return result;
}
+ @Override
public IMember getSourceMember() {
getKeys(); // Initialize source member
return funcSourceMember;
}
}
-}
+}
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -20,9 +20,9 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine;
import org.jboss.tools.common.el.core.ca.MessagesELTextProposal;
import org.jboss.tools.common.el.core.model.ELArgumentInvocation;
@@ -64,14 +64,14 @@
import org.w3c.dom.Node;
public class JSFMessageELCompletionEngine extends AbstractELCompletionEngine<IVariable> {
- private static final Image JSF_EL_MESSAGES_PROPOSAL_IMAGE = JSFModelPlugin.getDefault().getImage(JSFModelPlugin.CA_JSF_MESSAGES_IMAGE_PATH);
+ private static final ImageDescriptor JSF_EL_MESSAGES_PROPOSAL_IMAGE = JSFModelPlugin.getDefault().getImageDescriptorFromRegistry(JSFModelPlugin.CA_JSF_MESSAGES_IMAGE_PATH);
/*
* (non-Javadoc)
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImageForMember(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo)
*/
@Override
- public Image getELProposalImageForMember(MemberInfo memberInfo) {
+ public ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo) {
return JSF_EL_MESSAGES_PROPOSAL_IMAGE;
}
@@ -262,7 +262,7 @@
if(varName.startsWith(operand.getText())) {
MessagesELTextProposal proposal = new MessagesELTextProposal();
proposal.setReplacementString(varName.substring(operand.getLength()));
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
List<XModelObject> objects = new ArrayList<XModelObject>();
@@ -307,7 +307,7 @@
MessagesELTextProposal proposal = new MessagesELTextProposal();
proposal.setReplacementString(varName.substring(operand.getLength()));
proposal.setLabel(varName);
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
List<XModelObject> objects = new ArrayList<XModelObject>();
IModelNature n = EclipseResourceUtil.getModelNature(var.f.getProject());
XModel model = n != null ? n.getModel() : null;
@@ -335,7 +335,7 @@
TextProposal proposal = new TextProposal();
proposal.setReplacementString(varName);
proposal.setLabel(varName);
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
proposals.add(proposal);
}
resolution.getLastSegment().getVariables().add(var);
@@ -637,7 +637,7 @@
kbProposal.setLabel(proposal);
}
kbProposal.setAlternateMatch(proposal);
- kbProposal.setImage(getELProposalImageForMember(null));
+ kbProposal.setImageDescriptor(getELProposalImageForMember(null));
List<XModelObject> objects = new ArrayList<XModelObject>();
String locale = getPageLocale(mbr.f, currentOffset);
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2012-07-23 22:33:19 UTC (rev 42679)
@@ -57,7 +57,8 @@
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.jst.standard.schemas;bundle-version="1.2.0",
org.eclipse.wst.standard.schemas;bundle-version="1.0.300",
- org.jboss.tools.common.el.ui
+ org.jboss.tools.common.el.ui,
+ org.jboss.tools.common.ui
Bundle-Version: 3.4.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JSPDialogContentProposalProvider.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -18,11 +18,6 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.jface.fieldassist.IContentProposal;
import org.eclipse.jface.fieldassist.IContentProposalProvider;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.sse.ui.internal.contentassist.IRelevanceCompletionProposal;
import org.eclipse.wst.sse.ui.internal.util.Sorter;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.jboss.tools.common.el.core.model.ELInstance;
@@ -33,18 +28,16 @@
import org.jboss.tools.common.el.core.parser.ELParserUtil;
import org.jboss.tools.common.el.core.resolver.ELResolver;
import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager;
-import org.jboss.tools.common.model.ui.ModelUIPlugin;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.jsp.contentassist.computers.AbstractXmlCompletionProposalComputer.TextRegion;
import org.jboss.tools.jst.jsp.contentassist.computers.JspELCompletionProposalComputer;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.messages.JstUIMessages;
import org.jboss.tools.jst.jsp.outline.ValueHelper;
import org.jboss.tools.jst.jsp.util.Constants;
import org.jboss.tools.jst.web.kb.IPageContext;
import org.jboss.tools.jst.web.kb.KbQuery;
-import org.jboss.tools.jst.web.kb.PageProcessor;
import org.jboss.tools.jst.web.kb.KbQuery.Type;
+import org.jboss.tools.jst.web.kb.PageProcessor;
import org.w3c.dom.Node;
/**
@@ -115,8 +108,6 @@
if(proposals != null) for (TextProposal textProposal: proposals) {
String displayString = textProposal.getReplacementString();
int cursorPosition = /*replacementOffset + */ textProposal.getReplacementString().length();
-
- Image image = textProposal.getImage();
String relacementString = textProposal.getReplacementString();
if(textProposal.getStart() >= 0 && textProposal.getEnd() >= 0) {
int b = textProposal.getStart();
@@ -145,8 +136,6 @@
}
String matchString = "#{" + prefix.getText(); //$NON-NLS-1$
String query = matchString;
- if (query == null)
- query = ""; //$NON-NLS-1$
String stringQuery = matchString;
int beginChangeOffset = prefix.getStartOffset() + prefix.getOffset();
@@ -155,7 +144,6 @@
TextProposal[] proposals = PageProcessor.getInstance().getProposals(kbQuery, pageContext);
if(proposals != null) for (TextProposal textProposal: proposals) {
- int replacementOffset = beginChangeOffset;
int replacementLength = prefix.getLength();
String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
int cursorPosition = /*replacementOffset + */ textProposal.getReplacementString().length();
@@ -164,8 +152,6 @@
textProposal.setReplacementString(textProposal.getReplacementString() + "}"); //$NON-NLS-1$
}
- Image image = textProposal.getImage();
-
// IContextInformation contextInformation = null;
// String additionalProposalInfo = textProposal.getContextInfo();
// int relevance = textProposal.getRelevance() + 10000;
@@ -285,8 +271,6 @@
return null;
}
- String matchString = text.substring(0, inValueOffset);
-
ELParser p = ELParserUtil.getJbossFactory().createParser();
ELModel model = p.parse(text);
@@ -348,5 +332,4 @@
result1[result.length] = v;
return result1;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlELCompletionProposalComputer.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -53,6 +53,7 @@
import org.jboss.tools.common.el.core.resolver.ELResolver;
import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager;
import org.jboss.tools.common.text.TextProposal;
+import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
import org.jboss.tools.jst.jsp.contentassist.AutoELContentAssistantProposal;
@@ -275,7 +276,7 @@
replacementString += String.valueOf(quoteChar);
}
- Image image = textProposal.getImage();
+ Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
// JBIDE-512, JBIDE-2541 related changes ===>>>
// String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
@@ -416,7 +417,7 @@
}
}
- Image image = textProposal.getImage();
+ Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
// JBIDE-512, JBIDE-2541 related changes ===>>>
// String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
@@ -510,7 +511,7 @@
replacementString += String.valueOf(quoteChar);
}
- Image image = textProposal.getImage();
+ Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
// JBIDE-512, JBIDE-2541 related changes ===>>>
// String displayString = prefix.getText().substring(0, replacementLength) + textProposal.getReplacementString();
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -44,6 +44,7 @@
import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.common.ui.CommonUIPlugin;
import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
import org.jboss.tools.jst.web.kb.IPageContext;
import org.jboss.tools.jst.web.kb.KbQuery;
@@ -139,7 +140,7 @@
int replacementOffset = contentAssistRequest.getReplacementBeginPosition();
int replacementLength = contentAssistRequest.getReplacementLength();
int cursorPosition = getCursorPositionForProposedText(replacementString);
- Image image = textProposal.getImage();
+ Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
if (image == null) {
image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE);
}
@@ -285,7 +286,7 @@
replacementString = textProposal.getReplacementString();
}
int cursorPosition = getCursorPositionForProposedText(replacementString);
- Image image = textProposal.getImage();
+ Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
String displayString = textProposal.getLabel() == null ?
replacementString :
textProposal.getLabel();
@@ -414,7 +415,7 @@
int replacementOffset = getOffset() - query.length();
int replacementLength = query.length();
int cursorPosition = getCursorPositionForProposedText(replacementString);
- Image image = textProposal.getImage();
+ Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
if (image == null) {
image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/WebKbPlugin.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -183,6 +183,10 @@
}
}
+ public static ImageDescriptor getImageDescriptor(Class<?> baseClass, String imageName) {
+ return ImageDescriptor.createFromFile(baseClass, imageName);
+ }
+
public static Image getImage(Class<?> baseClass, String imageName) {
ImageRegistry registry = getDefault().getImageRegistry();
Image result = registry.get(imageName);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ActionProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ActionProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ActionProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -18,7 +18,6 @@
import java.util.TreeSet;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
@@ -33,7 +32,7 @@
*/
public class ActionProposalType extends ModelProposalType {
- private static final String IMAGE_NAME = "JSFActionProposal.gif"; //$NON-NLS-1$
+ private static final ImageDescriptor IMAGE = WebKbPlugin.getImageDescriptor(WebKbPlugin.class, "JSFActionProposal.gif"); //$NON-NLS-1$
/*
* (non-Javadoc)
@@ -68,7 +67,7 @@
proposal.setLabel(text);
proposal.setReplacementString(text);
proposal.setPosition(text.length());
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
proposals.add(proposal);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/CSSClassProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/CSSClassProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/CSSClassProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -15,6 +15,7 @@
import java.util.Set;
import java.util.TreeSet;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.ICSSContainerSupport;
import org.jboss.tools.jst.web.kb.IPageContext;
@@ -34,7 +35,7 @@
*
*/
public class CSSClassProposalType extends CustomProposalType {
- private static final String IMAGE_NAME = "EnumerationProposal.gif"; //$NON-NLS-1$
+ private static final ImageDescriptor IMAGE = WebKbPlugin.getImageDescriptor(WebKbPlugin.class, "EnumerationProposal.gif"); //$NON-NLS-1$
static String ID = "cssclass"; //$NON-NLS-1$
static String QUOTE_1 = "'"; //$NON-NLS-1$
@@ -120,7 +121,7 @@
}
return styleNames;
}
-
+
@Override
public TextProposal[] getProposals(KbQuery query) {
// Do not use getValue() because it trims the string and removes opening quote char, but all the characters
@@ -134,7 +135,7 @@
b = (b == -1 ? v.lastIndexOf('\t') : b);
b = (b == -1 ? predicateLength : b + 1);
int e = v.length();
-
+
String prefix = v.substring(b);
List<TextProposal> proposals = new ArrayList<TextProposal>();
@@ -146,7 +147,7 @@
proposal.setPosition(b + text.length() - predicateLength);
proposal.setStart(b - predicateLength);
proposal.setEnd(e - predicateLength);
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
proposals.add(proposal);
}
@@ -154,5 +155,4 @@
return proposals.toArray(new TextProposal[0]);
}
-
-}
+}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ConverterIDProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ConverterIDProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ConverterIDProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -17,7 +17,6 @@
import java.util.TreeSet;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.KbQuery;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
@@ -30,20 +29,20 @@
*/
public class ConverterIDProposalType extends ModelProposalType {
- private static final String IMAGE_NAME = "EnumerationProposal.gif"; //$NON-NLS-1$
+ private static final ImageDescriptor IMAGE = WebKbPlugin.getImageDescriptor(WebKbPlugin.class, "EnumerationProposal.gif"); //$NON-NLS-1$
public ConverterIDProposalType() {}
@Override
public TextProposal[] getProposals(KbQuery query) {
String v = query.getValue();
-
+
List<Object> list = provider.getList(xModel, getListID(), v, new Properties());
Set<String> idList = new TreeSet<String>();
if(list != null) {
for (Object o: list) idList.add(o.toString());
}
-
+
List<TextProposal> proposals = new ArrayList<TextProposal>();
for (String text: idList) {
if(text.startsWith(v)) {
@@ -51,17 +50,16 @@
proposal.setLabel(text);
proposal.setReplacementString(text);
proposal.setPosition(text.length());
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
proposals.add(proposal);
}
}
-
+
return proposals.toArray(new TextProposal[0]);
}
protected String getListID() {
return IWebPromptingProvider.JSF_CONVERTER_IDS;
}
-
-}
+}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/EnumerationProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/EnumerationProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/EnumerationProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -13,6 +13,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.IPageContext;
import org.jboss.tools.jst.web.kb.KbQuery;
@@ -23,7 +24,7 @@
*/
public class EnumerationProposalType extends CustomProposalType {
- private static final String IMAGE_NAME = "EnumerationProposal.gif"; //$NON-NLS-1$
+ private static final ImageDescriptor IMAGE = WebKbPlugin.getImageDescriptor(WebKbPlugin.class, "EnumerationProposal.gif"); //$NON-NLS-1$
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.internal.taglib.CustomProposalType#getProposals(org.jboss.tools.jst.web.kb.KbQuery)
@@ -41,7 +42,7 @@
proposal.setLabel(text);
proposal.setReplacementString(text);
proposal.setPosition(text.length());
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
proposals.add(proposal);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FaceletsJsfCProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FaceletsJsfCProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FaceletsJsfCProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -15,7 +15,7 @@
import java.util.List;
import java.util.Map;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
import org.jboss.tools.common.text.TextProposal;
@@ -33,7 +33,7 @@
@SuppressWarnings("restriction")
public class FaceletsJsfCProposalType extends CustomProposalType {
- private static Image ICON;
+ private static ImageDescriptor ICON;
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.internal.taglib.CustomProposalType#getProposals(org.jboss.tools.jst.web.kb.KbQuery)
@@ -97,9 +97,9 @@
int position = proposal.getReplacementString().length();
proposal.setPosition(position);
if (ICON == null) {
- ICON = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
+ ICON = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
}
- proposal.setImage(ICON);
+ proposal.setImageDescriptor(ICON);
return proposal;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FacetNameProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FacetNameProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/FacetNameProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -16,7 +16,6 @@
import java.util.Set;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.IPageContext;
import org.jboss.tools.jst.web.kb.KbQuery;
@@ -34,7 +33,7 @@
public class FacetNameProposalType extends CustomProposalType {
private static final String IMAGE_NAME = "EnumerationProposal.gif"; //$NON-NLS-1$
- private static Image ICON;
+ private static ImageDescriptor ICON;
private IPageContext context;
@@ -87,9 +86,9 @@
proposal.setReplacementString(facetName);
proposal.setPosition(facetName.length());
if(ICON==null) {
- ICON = ImageDescriptor.createFromFile(WebKbPlugin.class, IMAGE_NAME).createImage();
+ ICON = ImageDescriptor.createFromFile(WebKbPlugin.class, IMAGE_NAME);
}
- proposal.setImage(ICON);
+ proposal.setImageDescriptor(ICON);
proposals.add(proposal);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/IDProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/IDProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/IDProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -17,7 +17,6 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.sse.core.StructuredModelManager;
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
@@ -32,7 +31,7 @@
@SuppressWarnings("restriction")
public class IDProposalType extends CustomProposalType {
- private static final String IMAGE_NAME = "EnumerationProposal.gif"; //$NON-NLS-1$
+ private static final ImageDescriptor IMAGE = WebKbPlugin.getImageDescriptor(WebKbPlugin.class, "EnumerationProposal.gif"); //$NON-NLS-1$
static String ID = "id"; //$NON-NLS-1$
static String QUOTE_1 = "'"; //$NON-NLS-1$
@@ -92,7 +91,7 @@
proposal.setPosition(b + text.length());
proposal.setStart(b);
proposal.setEnd(e);
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
proposals.add(proposal);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourceBundleNameProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourceBundleNameProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourceBundleNameProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -17,7 +17,6 @@
import java.util.TreeSet;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.KbQuery;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
@@ -28,7 +27,7 @@
*/
public class ResourceBundleNameProposalType extends ModelProposalType {
- private static final String IMAGE_NAME = "MessageBundleProposal.gif"; //$NON-NLS-1$
+ private static final ImageDescriptor IMAGE = WebKbPlugin.getImageDescriptor(WebKbPlugin.class, "MessageBundleProposal.gif"); //$NON-NLS-1$
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.internal.taglib.CustomProposalType#getProposals(org.jboss.tools.jst.web.kb.KbQuery)
@@ -52,7 +51,7 @@
proposal.setLabel(text);
proposal.setReplacementString(text);
proposal.setPosition(text.length());
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
proposals.add(proposal);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourcePathProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourcePathProposalType.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/ResourcePathProposalType.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -23,7 +23,6 @@
import org.eclipse.core.resources.IResourceVisitor;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
@@ -37,7 +36,7 @@
*/
public class ResourcePathProposalType extends ModelProposalType {
- private static final String IMAGE_NAME = "ResourcePathProposal.gif"; //$NON-NLS-1$
+ private static final ImageDescriptor IMAGE = WebKbPlugin.getImageDescriptor(WebKbPlugin.class, "ResourcePathProposal.gif"); //$NON-NLS-1$
private static Set<String> GRAPHIC_FILE_EXTENSIONS = new HashSet<String>();
private static Set<String> PAGE_FILE_EXTENSIONS = new HashSet<String>();
private static Set<String> CSS_FILE_EXTENSIONS = new HashSet<String>();
@@ -126,7 +125,7 @@
}
proposal.setReplacementString(replacementString);
proposal.setPosition(replacementString.length());
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
if(newValue == value) {
proposals.add(proposal);
}
@@ -149,7 +148,7 @@
proposal.setAutoActivationContentAssistantAfterApplication(false);
proposal.setReplacementString(replacementString);
proposal.setPosition(replacementString.length());
- proposal.setImage(WebKbPlugin.getImage(WebKbPlugin.class, IMAGE_NAME));
+ proposal.setImageDescriptor(IMAGE);
proposals.add(proposal);
}
return proposals.toArray(new TextProposal[0]);
@@ -202,6 +201,7 @@
* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.internal.taglib.ModelProposalType#isReadyToUse()
*/
+ @Override
protected boolean isReadyToUse() {
return webRootResource!=null;
}
@@ -315,6 +315,7 @@
return extensions == null || extensions.isEmpty() || extensions.contains(ext);
}
+ @Override
public boolean visit(IResource resource) throws CoreException {
if(resource instanceof IFile) {
IFile file = (IFile)resource;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2012-07-23 15:14:28 UTC (rev 42678)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELCompletionEngine.java 2012-07-23 22:33:19 UTC (rev 42679)
@@ -21,10 +21,10 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
-import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine;
import org.jboss.tools.common.el.core.ca.MessagesELTextProposal;
import org.jboss.tools.common.el.core.model.ELArgumentInvocation;
@@ -71,10 +71,10 @@
*/
public final class SeamELCompletionEngine extends AbstractELCompletionEngine<ISeamContextVariable> {
- private static final Image SEAM_EL_PROPOSAL_IMAGE =
- SeamCorePlugin.getDefault().getImage(SeamCorePlugin.CA_SEAM_EL_IMAGE_PATH);
- private static final Image SEAM_MESSAGES_PROPOSAL_IMAGE =
- SeamCorePlugin.getDefault().getImage(SeamCorePlugin.CA_SEAM_MESSAGES_IMAGE_PATH);
+ private static final ImageDescriptor SEAM_EL_PROPOSAL_IMAGE =
+ SeamCorePlugin.getDefault().getImageDescriptorFromRegistry(SeamCorePlugin.CA_SEAM_EL_IMAGE_PATH);
+ private static final ImageDescriptor SEAM_MESSAGES_PROPOSAL_IMAGE =
+ SeamCorePlugin.getDefault().getImageDescriptorFromRegistry(SeamCorePlugin.CA_SEAM_MESSAGES_IMAGE_PATH);
private static ELParserFactory factory = ELParserUtil.getJbossFactory();
@@ -89,7 +89,7 @@
* @see org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine#getELProposalImageForMember(org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo)
*/
@Override
- public Image getELProposalImageForMember(MemberInfo memberInfo) {
+ public ImageDescriptor getELProposalImageForMember(MemberInfo memberInfo) {
return SEAM_EL_PROPOSAL_IMAGE;
}
@@ -176,9 +176,9 @@
@Override
protected void setImage(TextProposal proposal, ISeamContextVariable var) {
if (isSeamMessagesComponentVariable((ISeamContextVariable)var)) {
- proposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE);
+ proposal.setImageDescriptor(SEAM_MESSAGES_PROPOSAL_IMAGE);
} else {
- proposal.setImage(getELProposalImageForMember(null));
+ proposal.setImageDescriptor(getELProposalImageForMember(null));
}
}
@@ -190,7 +190,7 @@
@Override
protected void setImage(TextProposal kbProposal, TypeInfoCollector.MemberPresentation proposal) {
if (proposal.getMember() instanceof MessagesInfo) {
- kbProposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE);
+ kbProposal.setImageDescriptor(SEAM_MESSAGES_PROPOSAL_IMAGE);
} else {
super.setImage(kbProposal, proposal);
}
@@ -366,7 +366,7 @@
kbProposal.setLabel(proposal);
}
kbProposal.setAlternateMatch(proposal);
- kbProposal.setImage(SEAM_MESSAGES_PROPOSAL_IMAGE);
+ kbProposal.setImageDescriptor(SEAM_MESSAGES_PROPOSAL_IMAGE);
Map<String, List<XModelObject>> properties = mbr.getPropertiesMap();
List<XModelObject> ps = properties.get(proposal);
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r42678 - in trunk/ws/tests: org.jboss.tools.ws.ui.test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-07-23 11:14:28 -0400 (Mon, 23 Jul 2012)
New Revision: 42678
Modified:
trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml
trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml
Log:
Bumping pom.xml versions to 1.4.0-SNAPSHOT
Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml 2012-07-23 14:07:25 UTC (rev 42677)
+++ trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml 2012-07-23 15:14:28 UTC (rev 42678)
@@ -16,4 +16,4 @@
<coverage.filter>org.jboss.tools.ws.core*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.ws.core</emma.instrument.bundles>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml 2012-07-23 14:07:25 UTC (rev 42677)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml 2012-07-23 15:14:28 UTC (rev 42678)
@@ -16,4 +16,4 @@
<coverage.filter>org.jboss.tools.ws.*</coverage.filter>
<emma.instrument.bundles>org.jboss.tools.ws.core,org.jboss.tools.ws.ui</emma.instrument.bundles>
</properties>
-</project>
\ No newline at end of file
+</project>
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r42677 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-07-23 10:07:25 -0400 (Mon, 23 Jul 2012)
New Revision: 42677
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java
Log:
Extended waiting time, because of failing JBoss Central tests (importing archetypes takes very long time)
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java 2012-07-23 12:39:20 UTC (rev 42676)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java 2012-07-23 14:07:25 UTC (rev 42677)
@@ -65,7 +65,7 @@
SWTBotShell activeShell = getActiveShell();
finish();
log.info("Waiting until active shell is active");
- bot().waitWhile(new ShellIsActiveCondition(activeShell), TaskDuration.VERY_LONG.getTimeout());
+ bot().waitWhile(new ShellIsActiveCondition(activeShell), TaskDuration.VERY_LONG.getTimeout()+TaskDuration.VERY_LONG.getTimeout()); //DO NOT COMMIT THIS!
log.info("Waiting until Progress Information Shell is active");
bot().waitWhile(new ProgressInformationShellIsActiveCondition(), TaskDuration.LONG.getTimeout());
log.info("Waiting until Non System Jobs run started");
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r42676 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-07-23 08:39:20 -0400 (Mon, 23 Jul 2012)
New Revision: 42676
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ManagePaletteGroupsTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/PaletteEditorTest.java
Log:
Use method getToolbarButtonWitTooltip() from PaletteView class.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java 2012-07-23 12:36:16 UTC (rev 42675)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java 2012-07-23 12:39:20 UTC (rev 42676)
@@ -13,6 +13,7 @@
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.view.PaletteView;
import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
public class CancelTagLibDefenitionTest extends VPEAutoTestCase{
@@ -22,7 +23,9 @@
openPage();
//Test open import dialog
bot.viewByTitle("JBoss Tools Palette").setFocus(); //$NON-NLS-1$
- bot.toolbarButtonWithTooltip("Import").click(); //$NON-NLS-1$
+ new PaletteView()
+ .getToolbarButtonWitTooltip("Import")
+ .click();
bot.shell("Import Tags from TLD File").activate(); //$NON-NLS-1$
//Test open edit TLD dialog
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java 2012-07-23 12:36:16 UTC (rev 42675)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java 2012-07-23 12:39:20 UTC (rev 42676)
@@ -15,6 +15,8 @@
import org.eclipse.swt.widgets.Event;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.view.PaletteView;
import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
public class ImportTagsFromTLDFileTest extends VPEAutoTestCase{
@@ -25,7 +27,9 @@
//Test clear group
bot.viewByTitle("JBoss Tools Palette").setFocus(); //$NON-NLS-1$
- bot.toolbarButtonWithTooltip("Palette Editor").click(); //$NON-NLS-1$
+ PaletteView paletteView = new PaletteView();
+ paletteView.getToolbarButtonWitTooltip(IDELabel.JBossToolsPalette.PALETTE_EDITOR_TOOL_ITEM)
+ .click();
bot.shell("Palette Editor").activate(); //$NON-NLS-1$
try {
bot.getDisplay().syncExec(new Runnable() {
@@ -69,7 +73,8 @@
//Test open import dialog
- bot.toolbarButtonWithTooltip("Import").click(); //$NON-NLS-1$
+ paletteView.getToolbarButtonWitTooltip(IDELabel.JBossToolsPalette.IMPORT_TOOL_ITEM)
+ .click();
bot.shell("Import Tags from TLD File").activate(); //$NON-NLS-1$
//Test set tag lib
@@ -90,7 +95,8 @@
//Test if group is created
- bot.toolbarButtonWithTooltip("Palette Editor").click(); //$NON-NLS-1$
+ paletteView.getToolbarButtonWitTooltip(IDELabel.JBossToolsPalette.PALETTE_EDITOR_TOOL_ITEM)
+ .click();
bot.shell("Palette Editor").activate(); //$NON-NLS-1$
try {
bot.getDisplay().syncExec(new Runnable() {
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ManagePaletteGroupsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ManagePaletteGroupsTest.java 2012-07-23 12:36:16 UTC (rev 42675)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ManagePaletteGroupsTest.java 2012-07-23 12:39:20 UTC (rev 42676)
@@ -15,6 +15,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.view.PaletteView;
import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser;
/**
@@ -46,7 +47,9 @@
* Hide or Show Pallete Group dependent on current Palette Group visibility
*/
private void hideShowPaletteGroup(){
- bot.toolbarButtonWithTooltip(IDELabel.JBossToolsPalette.SHOW_HIDE_TOOL_ITEM).click();
+ new PaletteView()
+ .getToolbarButtonWitTooltip(IDELabel.JBossToolsPalette.SHOW_HIDE_TOOL_ITEM)
+ .click();
SWTBot dialogBot = bot.shell(IDELabel.Shell.SHOW_HIDE_DRAWERS).activate().bot();
SWTBotTreeItem tiTestPaletteGroup = dialogBot.tree().getTreeItem(ManagePaletteGroupsTest.TEST_PALETTE_TREE_GROUP_LABEL);
if (tiTestPaletteGroup.isChecked()){
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/PaletteEditorTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/PaletteEditorTest.java 2012-07-23 12:36:16 UTC (rev 42675)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/PaletteEditorTest.java 2012-07-23 12:39:20 UTC (rev 42676)
@@ -19,6 +19,7 @@
import org.jboss.tools.ui.bot.ext.SWTBotExt;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.view.PaletteView;
import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser;
/**
@@ -38,7 +39,9 @@
openPage();
openPalette();
// add First Palette Group
- bot.toolbarButtonWithTooltip(IDELabel.JBossToolsPalette.PALETTE_EDITOR_TOOL_ITEM).click();
+ PaletteView paletteView = new PaletteView();
+ paletteView.getToolbarButtonWitTooltip(IDELabel.JBossToolsPalette.PALETTE_EDITOR_TOOL_ITEM)
+ .click();
SWTBot palettEditorBot = bot.shell(IDELabel.Shell.PALETTE_EDITOR).activate().bot();
SWTBotTree tree = palettEditorBot.tree();
SWTBotTreeItem tiPalette = tree.expandNode(IDELabel.PaletteEditor.XSTUDIO_NODE)
@@ -102,7 +105,8 @@
jspTextEditor.setText(originalText);
jspTextEditor.save();
// Delete New Group From Palette
- bot.toolbarButtonWithTooltip(IDELabel.JBossToolsPalette.PALETTE_EDITOR_TOOL_ITEM).click();
+ paletteView.getToolbarButtonWitTooltip(IDELabel.JBossToolsPalette.PALETTE_EDITOR_TOOL_ITEM)
+ .click();
palettEditorBot = bot.shell(IDELabel.Shell.PALETTE_EDITOR).activate().bot();
tree = palettEditorBot.tree();
tiFirstGroup = tree.expandNode(IDELabel.PaletteEditor.XSTUDIO_NODE)
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r42675 - in trunk/ws: plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-07-23 08:36:16 -0400 (Mon, 23 Jul 2012)
New Revision: 42675
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsHttpMethod.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/Annotation.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaAnnotationsVisitor.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/MethodParametersCompletionProposalComputer.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java
Log:
Fixed - JBIDE-11076
Replace TypedRegion with SourceRange in JavaMethodParameter
https://issues.jboss.org/browse/JBIDE-11076
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsHttpMethod.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsHttpMethod.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsHttpMethod.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -117,9 +117,9 @@
.create("HTTP Verb should not be empty", getResource());
message.setAttribute(IMarker.MARKER, JaxrsMetamodelBuilder.JAXRS_PROBLEM);
message.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
- message.setAttribute(IMarker.CHAR_START, annotation.getRegion().getOffset());
- message.setAttribute(IMarker.CHAR_END, annotation.getRegion().getOffset()
- + annotation.getRegion().getLength());
+ message.setAttribute(IMarker.CHAR_START, annotation.getSourceRange().getOffset());
+ message.setAttribute(IMarker.CHAR_END, annotation.getSourceRange().getOffset()
+ + annotation.getSourceRange().getLength());
messages.add(message);
}
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -37,7 +37,6 @@
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jface.text.TypedRegion;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.validation.ValidatorMessage;
import org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsMetamodelBuilder;
@@ -314,7 +313,7 @@
final String msg = NLS
.bind(ValidationMessages.INVALID_PATHPARAM_VALUE,
pathParamValueProposals);
- final TypedRegion region = annotation.getRegion();
+ final ISourceRange region = annotation.getSourceRange();
ValidatorMessage validationMsg = createValidationMessage(msg, IMarker.SEVERITY_ERROR, region.getOffset(), region.getLength());
hasErrors(true);
messages.add(validationMsg);
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/Annotation.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/Annotation.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/Annotation.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -16,7 +16,7 @@
import org.eclipse.jdt.core.IAnnotation;
import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jface.text.TypedRegion;
+import org.eclipse.jdt.core.ISourceRange;
public class Annotation {
@@ -26,7 +26,7 @@
private final Map<String, List<String>> javaAnnotationElements;
- private TypedRegion region;
+ private ISourceRange sourceRange;
/**
* Full constructor
@@ -36,11 +36,11 @@
* @param annotationElements
*/
public Annotation(IAnnotation annotation, String name, Map<String, List<String>> annotationElements,
- final TypedRegion region) {
+ final ISourceRange sourceRange) {
this.javaAnnotation = annotation;
this.javaAnnotationName = name;
this.javaAnnotationElements = new HashMap<String, List<String>>(annotationElements);
- this.region = region;
+ this.sourceRange = sourceRange;
}
public boolean update(Annotation annotation) {
@@ -51,8 +51,8 @@
}
this.javaAnnotationElements.clear();
this.javaAnnotationElements.putAll(annotation.getJavaAnnotationElements());
- if (annotation.getRegion() != null) {
- this.region = annotation.getRegion();
+ if (annotation.getSourceRange() != null) {
+ this.sourceRange = annotation.getSourceRange();
}
return true;
}
@@ -73,8 +73,8 @@
return javaAnnotationElements;
}
- public TypedRegion getRegion() {
- return region;
+ public ISourceRange getSourceRange() {
+ return sourceRange;
}
/** @return the value */
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaAnnotationsVisitor.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaAnnotationsVisitor.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaAnnotationsVisitor.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -19,7 +19,9 @@
import org.eclipse.jdt.core.IAnnotation;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.SourceRange;
import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.dom.ASTVisitor;
import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
@@ -29,8 +31,6 @@
import org.eclipse.jdt.core.dom.MethodDeclaration;
import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TypedRegion;
/**
* A visitor for a single annotation on a java member (can be a method or a type).
@@ -188,11 +188,11 @@
if (annotationNames.contains(qualifiedName) || annotationNames.contains(name)) {
final String annotationName = annotationBinding.getAnnotationType().getQualifiedName();
final Map<String, List<String>> annotationElements = resolveAnnotationElements(annotationBinding);
- final TypedRegion typedRegion = new TypedRegion(annotation.getStartPosition(),
- annotation.getLength(), IDocument.DEFAULT_CONTENT_TYPE);
+ final ISourceRange sourceRange = new SourceRange(annotation.getStartPosition(),
+ annotation.getLength());
final IAnnotation javaAnnotation = (IAnnotation) annotationBinding.getJavaElement();
annotations
- .add(new Annotation(javaAnnotation, annotationName, annotationElements, typedRegion));
+ .add(new Annotation(javaAnnotation, annotationName, annotationElements, sourceRange));
}
}
}
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -18,8 +18,10 @@
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.core.SourceRange;
import org.eclipse.jdt.core.dom.ASTVisitor;
import org.eclipse.jdt.core.dom.Annotation;
import org.eclipse.jdt.core.dom.IAnnotationBinding;
@@ -102,10 +104,10 @@
IAnnotationBinding annotationBinding = annotation.resolveAnnotationBinding();
final String annotationName = annotationBinding.getAnnotationType().getQualifiedName();
final Map<String, List<String>> annotationElements = resolveAnnotationElements(annotationBinding);
- final TypedRegion typedRegion = new TypedRegion(annotation.getStartPosition(),
- annotation.getLength(), IDocument.DEFAULT_CONTENT_TYPE);
+ final ISourceRange sourceRange = new SourceRange(annotation.getStartPosition(),
+ annotation.getLength());
paramAnnotations.add(new org.jboss.tools.ws.jaxrs.core.jdt.Annotation(null, annotationName,
- annotationElements, typedRegion));
+ annotationElements, sourceRange));
}
}
final TypedRegion typedRegion = new TypedRegion(parameter.getStartPosition(),
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/MethodParametersCompletionProposalComputer.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/MethodParametersCompletionProposalComputer.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/MethodParametersCompletionProposalComputer.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -81,6 +81,7 @@
* the java content assist invocation context
* @return the typed region
*/
+ @SuppressWarnings("unused")
private ITypedRegion getRegion(final JavaContentAssistInvocationContext javaContext) {
IDocument document = javaContext.getDocument();
IDocumentPartitioner documentPartitioner = ((IDocumentExtension3) document)
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/contentassist/PathParamAnnotationValueCompletionProposalComputer.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -22,6 +22,7 @@
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMember;
+import org.eclipse.jdt.core.ISourceRange;
import org.eclipse.jdt.ui.text.IJavaPartitions;
import org.eclipse.jdt.ui.text.java.ContentAssistInvocationContext;
import org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer;
@@ -31,7 +32,6 @@
import org.eclipse.jface.text.IDocumentExtension3;
import org.eclipse.jface.text.IDocumentPartitioner;
import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.TypedRegion;
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.viewers.StyledString;
@@ -86,10 +86,10 @@
if (resourceMethod != null) {
for (JavaMethodParameter methodParameter : resourceMethod.getJavaMethodParameters()) {
for (Annotation annotation : methodParameter.getAnnotations()) {
- final TypedRegion region = annotation.getRegion();
- if (annotation.getName().equals(PathParam.class.getName()) && region != null
- && context.getInvocationOffset() >= region.getOffset()
- && context.getInvocationOffset() < (region.getOffset() + region.getLength())) {
+ final ISourceRange range = annotation.getSourceRange();
+ if (annotation.getName().equals(PathParam.class.getName()) && range != null
+ && context.getInvocationOffset() >= range.getOffset()
+ && context.getInvocationOffset() < (range.getOffset() + range.getLength())) {
// completion proposal on @PathParam method
// annotation
return internalComputePathParamProposals(javaContext, annotation, resourceMethod);
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java 2012-07-23 12:35:31 UTC (rev 42674)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java 2012-07-23 12:36:16 UTC (rev 42675)
@@ -330,7 +330,7 @@
assertThat(javaAnnotation.getName(), equalTo(Path.class.getName()));
assertThat(javaAnnotation.getJavaAnnotationElements().size(), equalTo(1));
assertThat(javaAnnotation.getJavaAnnotationElements().get("value").get(0), equalTo("/customers"));
- assertThat(javaAnnotation.getRegion(), notNullValue());
+ assertThat(javaAnnotation.getSourceRange(), notNullValue());
}
@Test
@@ -348,7 +348,7 @@
for (Entry<String, Annotation> entry : javaAnnotations.entrySet()) {
assertThat(entry.getKey(), equalTo(entry.getValue().getName()));
assertThat(entry.getValue().getJavaAnnotation(), notNullValue());
- assertThat(entry.getValue().getRegion(), notNullValue());
+ assertThat(entry.getValue().getSourceRange(), notNullValue());
}
}
@@ -495,8 +495,8 @@
for (JavaMethodParameter parameter : methodSignature.getMethodParameters()) {
assertThat(parameter.getAnnotations().size(), isOneOf(1, 2));
for (Annotation annotation : parameter.getAnnotations()) {
- assertThat(annotation.getRegion().getOffset(), greaterThan(sourceRange.getOffset()));
- assertThat(annotation.getRegion().getOffset(),
+ assertThat(annotation.getSourceRange().getOffset(), greaterThan(sourceRange.getOffset()));
+ assertThat(annotation.getSourceRange().getOffset(),
lessThan(sourceRange.getOffset() + sourceRange.getLength()));
}
}
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r42674 - trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-07-23 08:35:31 -0400 (Mon, 23 Jul 2012)
New Revision: 42674
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsMetamodel.java
Log:
Adding missing switches
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsMetamodel.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsMetamodel.java 2012-07-23 12:18:23 UTC (rev 42673)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsMetamodel.java 2012-07-23 12:35:31 UTC (rev 42674)
@@ -149,6 +149,12 @@
final JaxrsResource resource = (JaxrsResource) element;
this.resources.add(resource);
break;
+ case RESOURCE_FIELD:
+ break;
+ case RESOURCE_METHOD:
+ break;
+ default:
+ break;
}
indexElement(element);
}
@@ -432,6 +438,10 @@
final JaxrsResource fieldResourceParent = ((JaxrsResourceField) element).getParentResource();
fieldResourceParent.removeField((JaxrsResourceField) element);
break;
+ case PROVIDER:
+ break;
+ default:
+ break;
}
unindexElement(element);
}
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r42673 - branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-07-23 08:18:23 -0400 (Mon, 23 Jul 2012)
New Revision: 42673
Modified:
branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java
Log:
JBIDE-11217: present verbose mode functionality in Forge JBT/JBDS Tooling
Modified: branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java
===================================================================
--- branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java 2012-07-23 11:57:37 UTC (rev 42672)
+++ branches/jbosstools-3.3.x/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java 2012-07-23 12:18:23 UTC (rev 42673)
@@ -25,7 +25,7 @@
private IProcess process = null;
private String state = STATE_NOT_RUNNING;
private final TerminateListener terminateListener = new TerminateListener();
- private MasterOutputListener masterOutputListener = new MasterOutputListener();
+ private MasterStreamListener masterStreamListener = new MasterStreamListener();
private CommandResultListener commandResultListener = new CommandResultListener();
private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
private List<ForgeOutputListener> outputListeners = new ArrayList<ForgeOutputListener>();
@@ -56,8 +56,12 @@
IStreamMonitor streamMonitor = streamsProxy.getOutputStreamMonitor();
if (streamMonitor != null) {
streamMonitor.addListener(startupListener);
- streamMonitor.addListener(masterOutputListener);
+ streamMonitor.addListener(masterStreamListener);
}
+ IStreamMonitor errorStreamMonitor = streamsProxy.getErrorStreamMonitor();
+ if (errorStreamMonitor != null) {
+ errorStreamMonitor.addListener(masterStreamListener);
+ }
}
}
progressMonitor.worked(1);
@@ -96,7 +100,7 @@
IStreamMonitor streamMonitor = streamsProxy.getOutputStreamMonitor();
if (streamMonitor != null) {
commandResultListener.command = str + '\n';
- streamMonitor.removeListener(masterOutputListener);
+ streamMonitor.removeListener(masterStreamListener);
streamMonitor.addListener(commandResultListener);
try {
streamsProxy.write(new Character((char)31).toString() + str + '\n');
@@ -113,7 +117,7 @@
commandResultListener.result = null;
commandResultListener.command = null;
streamMonitor.removeListener(commandResultListener);
- streamMonitor.addListener(masterOutputListener);
+ streamMonitor.addListener(masterStreamListener);
}
}
}
@@ -152,8 +156,12 @@
if (streamsProxy != null) {
IStreamMonitor streamMonitor = streamsProxy.getOutputStreamMonitor();
if (streamMonitor != null) {
- streamMonitor.removeListener(masterOutputListener);
+ streamMonitor.removeListener(masterStreamListener);
}
+ IStreamMonitor errorStreamMonitor = streamsProxy.getErrorStreamMonitor();
+ if (errorStreamMonitor != null) {
+ errorStreamMonitor.removeListener(masterStreamListener);
+ }
}
process.terminate();
ForgeCorePlugin.removeForgeProcess(process);
@@ -193,7 +201,7 @@
}
}
- private class MasterOutputListener implements IStreamListener {
+ private class MasterStreamListener implements IStreamListener {
@Override
public void streamAppended(String text, IStreamMonitor monitor) {
for (ForgeOutputListener listener : outputListeners) {
13 years, 8 months
- 1
- 0
JBoss Tools SVN: r42672 - trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-07-23 07:57:37 -0400 (Mon, 23 Jul 2012)
New Revision: 42672
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java
Log:
JBIDE-11217: present verbose mode functionality in Forge JBT/JBDS Tooling
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java 2012-07-23 11:45:31 UTC (rev 42671)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java 2012-07-23 11:57:37 UTC (rev 42672)
@@ -25,7 +25,7 @@
private IProcess process = null;
private String state = STATE_NOT_RUNNING;
private final TerminateListener terminateListener = new TerminateListener();
- private MasterOutputListener masterOutputListener = new MasterOutputListener();
+ private MasterStreamListener masterStreamListener = new MasterStreamListener();
private CommandResultListener commandResultListener = new CommandResultListener();
private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
private List<ForgeOutputListener> outputListeners = new ArrayList<ForgeOutputListener>();
@@ -53,11 +53,15 @@
DebugPlugin.getDefault().addDebugEventListener(terminateListener);
IStreamsProxy streamsProxy = getStreamsProxy();
if (streamsProxy != null) {
- IStreamMonitor streamMonitor = streamsProxy.getOutputStreamMonitor();
- if (streamMonitor != null) {
- streamMonitor.addListener(startupListener);
- streamMonitor.addListener(masterOutputListener);
+ IStreamMonitor outputStreamMonitor = streamsProxy.getOutputStreamMonitor();
+ if (outputStreamMonitor != null) {
+ outputStreamMonitor.addListener(startupListener);
+ outputStreamMonitor.addListener(masterStreamListener);
}
+ IStreamMonitor errorStreamMonitor = streamsProxy.getErrorStreamMonitor();
+ if (errorStreamMonitor != null) {
+ errorStreamMonitor.addListener(masterStreamListener);
+ }
}
}
progressMonitor.worked(1);
@@ -96,7 +100,7 @@
IStreamMonitor streamMonitor = streamsProxy.getOutputStreamMonitor();
if (streamMonitor != null) {
commandResultListener.command = str + '\n';
- streamMonitor.removeListener(masterOutputListener);
+ streamMonitor.removeListener(masterStreamListener);
streamMonitor.addListener(commandResultListener);
try {
streamsProxy.write(new Character((char)31).toString() + str + '\n');
@@ -113,7 +117,7 @@
commandResultListener.result = null;
commandResultListener.command = null;
streamMonitor.removeListener(commandResultListener);
- streamMonitor.addListener(masterOutputListener);
+ streamMonitor.addListener(masterStreamListener);
}
}
}
@@ -150,10 +154,14 @@
if (process != null) {
IStreamsProxy streamsProxy = getStreamsProxy();
if (streamsProxy != null) {
- IStreamMonitor streamMonitor = streamsProxy.getOutputStreamMonitor();
- if (streamMonitor != null) {
- streamMonitor.removeListener(masterOutputListener);
+ IStreamMonitor outputStreamMonitor = streamsProxy.getOutputStreamMonitor();
+ if (outputStreamMonitor != null) {
+ outputStreamMonitor.removeListener(masterStreamListener);
}
+ IStreamMonitor errorStreamMonitor = streamsProxy.getErrorStreamMonitor();
+ if (errorStreamMonitor != null) {
+ errorStreamMonitor.removeListener(masterStreamListener);
+ }
}
process.terminate();
ForgeCorePlugin.removeForgeProcess(process);
@@ -200,7 +208,7 @@
}
}
- private class MasterOutputListener implements IStreamListener {
+ private class MasterStreamListener implements IStreamListener {
@Override
public void streamAppended(String text, IStreamMonitor monitor) {
for (ForgeOutputListener listener : outputListeners) {
13 years, 8 months
- 1
- 0