JBoss Tools SVN: r11933 - trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-20 17:56:52 -0500 (Thu, 20 Nov 2008)
New Revision: 11933
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/QueryContribution.java
Log:
JBIDE-3233 - NPE removed via slightly better code and ConcurrentHashMap
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/QueryContribution.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/QueryContribution.java 2008-11-20 22:20:31 UTC (rev 11932)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/QueryContribution.java 2008-11-20 22:56:52 UTC (rev 11933)
@@ -11,6 +11,7 @@
package org.jboss.tools.jmx.ui.internal.views.navigator;
import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
@@ -51,7 +52,7 @@
private String filterText, oldFilterText;
- private HashMap<Object, Boolean> cache = new HashMap<Object, Boolean>();
+ private ConcurrentHashMap<Object, Boolean> cache = new ConcurrentHashMap<Object, Boolean>();
private Navigator navigator;
private boolean requiresRefine;
private RefineThread refineThread = null;
@@ -107,8 +108,9 @@
protected boolean cache(Object o, boolean refine, ITreeContentProvider provider) {
if( !refine ) {
- if( cache.get(o) != null ) {
- return cache.get(o).booleanValue();
+ Boolean val = cache.get(o);
+ if( val != null ) {
+ return val.booleanValue();
}
}
@@ -144,7 +146,7 @@
}
protected void clearCache() {
- cache = new HashMap<Object,Boolean>();
+ cache = new ConcurrentHashMap<Object,Boolean>();
requiresRefine = false;
}
17 years, 5 months
JBoss Tools SVN: r11932 - trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-20 17:20:31 -0500 (Thu, 20 Nov 2008)
New Revision: 11932
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/MBeanOperationInfoWrapper.java
Log:
JBIDE-3231 - errors when pressing * in jmx
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/MBeanOperationInfoWrapper.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/MBeanOperationInfoWrapper.java 2008-11-20 20:44:43 UTC (rev 11931)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/MBeanOperationInfoWrapper.java 2008-11-20 22:20:31 UTC (rev 11932)
@@ -9,6 +9,7 @@
package org.jboss.tools.jmx.core;
import javax.management.MBeanOperationInfo;
+import javax.management.MBeanParameterInfo;
import org.eclipse.core.runtime.Assert;
@@ -34,6 +35,12 @@
return result;
}
+
+ /*
+ * Everything below here is duplication from javax.management
+ * to overcome a jboss bug where some mbeans do not conform to spec.
+ */
+
public boolean equals(Object obj) {
if (this == obj)
return true;
@@ -45,8 +52,56 @@
if (info == null) {
if (other.info != null)
return false;
- } else if (!info.equals(other.info))
+ } else if (!equals2(other.info))
return false;
return true;
}
+
+ private boolean equals2(MBeanOperationInfo o) {
+ if (o == info)
+ return true;
+ if (!(o instanceof MBeanOperationInfo))
+ return false;
+ MBeanOperationInfo p = (MBeanOperationInfo) o;
+ return (p.getName().equals(info.getName()) &&
+ p.getReturnType().equals(info.getReturnType()) &&
+ p.getDescription().equals(info.getDescription()) &&
+ p.getImpact() == info.getImpact() &&
+ arrayEquals(p.getSignature(), info.getSignature()) &&
+ p.getDescriptor().equals(info.getDescriptor()));
+
+ }
+
+ private boolean arrayEquals(MBeanParameterInfo[] a, MBeanParameterInfo[] a2) {
+ if (a==a2)
+ return true;
+ if (a==null || a2==null)
+ return false;
+
+ int length = a.length;
+ if (a2.length != length)
+ return false;
+
+ for (int i=0; i<length; i++) {
+ MBeanParameterInfo o1 = a[i];
+ MBeanParameterInfo o2 = a2[i];
+ if (!(o1==null ? o2==null : paramEquals(o1,o2)))
+ return false;
+ }
+
+ return true;
+ }
+
+ private boolean paramEquals(MBeanParameterInfo o1, MBeanParameterInfo o2) {
+ if (o1 == o2)
+ return true;
+ return (o1.getName().equals(o2.getName()) &&
+ o1.getType().equals(o2.getType()) &&
+ safeEquals(o1.getDescription(), o2.getDescription()) &&
+ o1.getDescriptor().equals(o2.getDescriptor()));
+ }
+
+ private boolean safeEquals(Object o1, Object o2) {
+ return o1 == o2 || !(o1 == null || o2 == null) || o1.equals(o2);
+ }
}
17 years, 5 months
JBoss Tools SVN: r11931 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-20 15:44:43 -0500 (Thu, 20 Nov 2008)
New Revision: 11931
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetLabelProvider.java
Log:
JBIDE-3234 - fileset label provider was drawing from wrong plugin's icon folder (drawing from as.ui, which had cleaned unused images)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetLabelProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetLabelProvider.java 2008-11-20 20:38:42 UTC (rev 11930)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetLabelProvider.java 2008-11-20 20:44:43 UTC (rev 11931)
@@ -11,10 +11,10 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
+import org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin;
import org.jboss.ide.eclipse.archives.webtools.ui.FilesetContentProvider.FolderWrapper;
import org.jboss.ide.eclipse.archives.webtools.ui.FilesetContentProvider.PathWrapper;
import org.jboss.ide.eclipse.archives.webtools.ui.FilesetContentProvider.ServerWrapper;
-import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
public class FilesetLabelProvider extends LabelProvider {
@@ -23,7 +23,7 @@
public FilesetLabelProvider() {
super();
this.resourceManager = new LocalResourceManager(JFaceResources.getResources());
- ImageDescriptor des = ImageDescriptor.createFromURL(JBossServerUIPlugin.getDefault().getBundle().getEntry("icons/multiple_files.gif")); //$NON-NLS-1$
+ ImageDescriptor des = ImageDescriptor.createFromURL(IntegrationPlugin.getDefault().getBundle().getEntry("icons/multiple_files.gif")); //$NON-NLS-1$
rootImage = des.createImage();
}
17 years, 5 months
JBoss Tools SVN: r11930 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-20 15:38:42 -0500 (Thu, 20 Nov 2008)
New Revision: 11930
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-3245 - jmx not enabled by default
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-11-20 20:20:16 UTC (rev 11929)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2008-11-20 20:38:42 UTC (rev 11930)
@@ -427,7 +427,7 @@
</enablement>
</actionProvider>
<navigatorContent
- activeByDefault="true"
+ activeByDefault="false"
contentProvider="org.jboss.ide.eclipse.as.ui.views.server.extensions.JMXProvider$ContentProvider"
icon="icons/jmeth_obj.gif"
id="org.jboss.ide.eclipse.as.ui.extensions.jmx"
17 years, 5 months
JBoss Tools SVN: r11929 - in trunk: jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-11-20 15:20:16 -0500 (Thu, 20 Nov 2008)
New Revision: 11929
Added:
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/JMXException.java
trunk/jmx/tests/org.jboss.tools.jmx.core.test/bin/
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnectionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/NodeUtils.java
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ObjectNameNode.java
trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/MockConnectionWrapper.java
Log:
JBIDE-3244 replace CoreException with JMXException
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java 2008-11-20 19:02:44 UTC (rev 11928)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java 2008-11-20 20:20:16 UTC (rev 11929)
@@ -17,6 +17,7 @@
import org.jboss.tools.jmx.core.IConnectionProviderListener;
import org.jboss.tools.jmx.core.IConnectionWrapper;
import org.jboss.tools.jmx.core.IJMXRunnable;
+import org.jboss.tools.jmx.core.JMXException;
import org.jboss.tools.jmx.core.tree.NodeUtils;
import org.jboss.tools.jmx.core.tree.Root;
@@ -74,7 +75,7 @@
return isConnected;
}
- public void run(IJMXRunnable runnable) throws CoreException {
+ public void run(IJMXRunnable runnable) throws JMXException {
// do nothing if the server is down.
if( server.getServerState() != IServer.STATE_STARTED )
return;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnectionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnectionProvider.java 2008-11-20 19:02:44 UTC (rev 11928)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnectionProvider.java 2008-11-20 20:20:16 UTC (rev 11929)
@@ -18,6 +18,7 @@
import org.jboss.tools.jmx.core.IConnectionProviderListener;
import org.jboss.tools.jmx.core.IConnectionWrapper;
import org.jboss.tools.jmx.core.IJMXRunnable;
+import org.jboss.tools.jmx.core.JMXException;
public class JBossServerConnectionProvider implements IConnectionProvider, IServerLifecycleListener {
public static final String PROVIDER_ID = "org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider"; //$NON-NLS-1$
@@ -32,7 +33,7 @@
// Run this action on the server.
// If the connection doesn't exist, make a new one
- public static void run(IServer s, IJMXRunnable r) throws CoreException {
+ public static void run(IServer s, IJMXRunnable r) throws JMXException {
JBossServerConnection c = getConnection(s);
if( c == null )
c = getConnection(s);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java 2008-11-20 19:02:44 UTC (rev 11928)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JMXSafeRunner.java 2008-11-20 20:20:16 UTC (rev 11929)
@@ -12,6 +12,7 @@
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.tools.jmx.core.IJMXRunnable;
+import org.jboss.tools.jmx.core.JMXException;
public class JMXSafeRunner {
private String user, pass;
@@ -34,13 +35,13 @@
run(server,r,user,pass);
}
- public static void run(IServer s, IJMXRunnable r) throws CoreException {
+ public static void run(IServer s, IJMXRunnable r) throws JMXException {
String user = ServerConverter.getJBossServer(s).getUsername();
String pass = ServerConverter.getJBossServer(s).getPassword();
run(s,r,user,pass);
}
- public static void run(IServer s, IJMXRunnable r, String user, String pass) throws CoreException {
+ public static void run(IServer s, IJMXRunnable r, String user, String pass) throws JMXException {
JMXClassLoaderRepository.getDefault().addConcerned(s, r);
ClassLoader currentLoader = Thread.currentThread()
.getContextClassLoader();
@@ -59,7 +60,7 @@
r.run(connection);
}
} catch( Exception e ) {
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, e.getMessage(), e));
+ throw new JMXException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, e.getMessage(), e));
} finally {
JMXClassLoaderRepository.getDefault().removeConcerned(s, r);
Thread.currentThread().setContextClassLoader(currentLoader);
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java 2008-11-20 19:02:44 UTC (rev 11928)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/IConnectionWrapper.java 2008-11-20 20:20:16 UTC (rev 11929)
@@ -38,5 +38,5 @@
* @return
*/
public Root getRoot();
- public void run(IJMXRunnable runnable) throws CoreException;
+ public void run(IJMXRunnable runnable) throws JMXException;
}
Added: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/JMXException.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/JMXException.java (rev 0)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/JMXException.java 2008-11-20 20:20:16 UTC (rev 11929)
@@ -0,0 +1,11 @@
+package org.jboss.tools.jmx.core;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+
+public class JMXException extends CoreException {
+ private static final long serialVersionUID = 1L;
+ public JMXException(IStatus status) {
+ super(status);
+ }
+}
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java 2008-11-20 19:02:44 UTC (rev 11928)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/providers/DefaultConnectionWrapper.java 2008-11-20 20:20:16 UTC (rev 11929)
@@ -30,6 +30,7 @@
import org.jboss.tools.jmx.core.IJMXRunnable;
import org.jboss.tools.jmx.core.JMXActivator;
import org.jboss.tools.jmx.core.JMXCoreMessages;
+import org.jboss.tools.jmx.core.JMXException;
import org.jboss.tools.jmx.core.tree.NodeUtils;
import org.jboss.tools.jmx.core.tree.Root;
@@ -114,12 +115,12 @@
}
}
- public void run(IJMXRunnable runnable) throws CoreException {
+ public void run(IJMXRunnable runnable) throws JMXException {
try {
runnable.run(connection);
} catch( Exception e ) {
IStatus s = new Status(IStatus.ERROR, JMXActivator.PLUGIN_ID, JMXCoreMessages.DefaultConnection_ErrorRunningJMXCode, e);
- throw new CoreException(s);
+ throw new JMXException(s);
}
}
}
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/NodeUtils.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/NodeUtils.java 2008-11-20 19:02:44 UTC (rev 11928)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/NodeUtils.java 2008-11-20 20:20:16 UTC (rev 11929)
@@ -14,11 +14,11 @@
import javax.management.ObjectName;
import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.jboss.tools.jmx.core.IConnectionWrapper;
import org.jboss.tools.jmx.core.IJMXRunnable;
+import org.jboss.tools.jmx.core.JMXException;
public class NodeUtils {
@@ -45,7 +45,7 @@
@SuppressWarnings("unchecked")
public static Root createObjectNameTree(final IConnectionWrapper connectionWrapper, final IProgressMonitor monitor)
- throws CoreException {
+ throws JMXException {
final Root[] _root = new Root[1];
connectionWrapper.run(new IJMXRunnable() {
public void run(MBeanServerConnection connection) throws Exception {
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ObjectNameNode.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ObjectNameNode.java 2008-11-20 19:02:44 UTC (rev 11928)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ObjectNameNode.java 2008-11-20 20:20:16 UTC (rev 11929)
@@ -10,9 +10,9 @@
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
-import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.jmx.core.IConnectionWrapper;
import org.jboss.tools.jmx.core.IJMXRunnable;
+import org.jboss.tools.jmx.core.JMXException;
import org.jboss.tools.jmx.core.MBeanInfoWrapper;
public class ObjectNameNode extends PropertyNode {
@@ -34,7 +34,7 @@
array[0] = new MBeanInfoWrapper(on2, mbsc.getMBeanInfo(on2), mbsc);
}
});
- } catch( CoreException ce ) {
+ } catch( JMXException ce ) {
// TODO LOG
}
wrapper = array[0];
Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/MockConnectionWrapper.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/MockConnectionWrapper.java 2008-11-20 19:02:44 UTC (rev 11928)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/MockConnectionWrapper.java 2008-11-20 20:20:16 UTC (rev 11929)
@@ -7,6 +7,7 @@
import org.jboss.tools.jmx.core.IConnectionProvider;
import org.jboss.tools.jmx.core.IConnectionWrapper;
import org.jboss.tools.jmx.core.IJMXRunnable;
+import org.jboss.tools.jmx.core.JMXException;
import org.jboss.tools.jmx.core.tree.Root;
@@ -34,7 +35,7 @@
return false;
}
- public void run(IJMXRunnable runnable) throws CoreException {
+ public void run(IJMXRunnable runnable) throws JMXException {
}
public void loadRoot(IProgressMonitor monitor) {
17 years, 5 months
JBoss Tools SVN: r11928 - trunk/portlet/plugins/org.jboss.tools.portlet.ui.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-20 14:02:44 -0500 (Thu, 20 Nov 2008)
New Revision: 11928
Added:
trunk/portlet/plugins/org.jboss.tools.portlet.ui/jboss_about.png
Removed:
trunk/portlet/plugins/org.jboss.tools.portlet.ui/rhds_wiz.png
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.ui/about.ini
trunk/portlet/plugins/org.jboss.tools.portlet.ui/build.properties
Log:
JBIDE-3240 Changing the icon for the birt, portlet and project-examples feature
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/about.ini
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.ui/about.ini 2008-11-20 19:02:38 UTC (rev 11927)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/about.ini 2008-11-20 19:02:44 UTC (rev 11928)
@@ -11,7 +11,7 @@
# needed for primary features only
# Property "featureImage" contains path to feature image (32x32)
-featureImage=rhds_wiz.png
+featureImage=jboss_about.png
# Property "aboutImage" contains path to product image (500x330 or 115x164)
# needed for primary features only
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/build.properties
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.ui/build.properties 2008-11-20 19:02:38 UTC (rev 11927)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/build.properties 2008-11-20 19:02:44 UTC (rev 11928)
@@ -11,4 +11,5 @@
about.ini,\
about.mappings,\
about.properties,\
- plugin.properties
+ plugin.properties,\
+ jboss_about.png
Added: trunk/portlet/plugins/org.jboss.tools.portlet.ui/jboss_about.png
===================================================================
(Binary files differ)
Property changes on: trunk/portlet/plugins/org.jboss.tools.portlet.ui/jboss_about.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/portlet/plugins/org.jboss.tools.portlet.ui/rhds_wiz.png
===================================================================
(Binary files differ)
17 years, 5 months
JBoss Tools SVN: r11927 - trunk/examples/plugins/org.jboss.tools.project.examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-20 14:02:38 -0500 (Thu, 20 Nov 2008)
New Revision: 11927
Added:
trunk/examples/plugins/org.jboss.tools.project.examples/jboss_about.png
Removed:
trunk/examples/plugins/org.jboss.tools.project.examples/rhds_wiz.png
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/about.ini
trunk/examples/plugins/org.jboss.tools.project.examples/build.properties
Log:
JBIDE-3240 Changing the icon for the birt, portlet and project-examples feature
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/about.ini
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/about.ini 2008-11-20 19:02:29 UTC (rev 11926)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/about.ini 2008-11-20 19:02:38 UTC (rev 11927)
@@ -11,7 +11,7 @@
# needed for primary features only
# Property "featureImage" contains path to feature image (32x32)
-featureImage=rhds_wiz.png
+featureImage=jboss_about.png
# Property "aboutImage" contains path to product image (500x330 or 115x164)
# needed for primary features only
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/build.properties
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/build.properties 2008-11-20 19:02:29 UTC (rev 11926)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/build.properties 2008-11-20 19:02:38 UTC (rev 11927)
@@ -11,4 +11,5 @@
about.mappings,\
about.properties,\
rhds_wiz.png,\
- schema/
+ schema/,\
+ jboss_about.png
Added: trunk/examples/plugins/org.jboss.tools.project.examples/jboss_about.png
===================================================================
(Binary files differ)
Property changes on: trunk/examples/plugins/org.jboss.tools.project.examples/jboss_about.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/examples/plugins/org.jboss.tools.project.examples/rhds_wiz.png
===================================================================
(Binary files differ)
17 years, 5 months
JBoss Tools SVN: r11926 - trunk/birt/plugins/org.jboss.tools.birt.oda.ui.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-20 14:02:29 -0500 (Thu, 20 Nov 2008)
New Revision: 11926
Added:
trunk/birt/plugins/org.jboss.tools.birt.oda.ui/jboss_about.png
Removed:
trunk/birt/plugins/org.jboss.tools.birt.oda.ui/rhds_wiz.png
Modified:
trunk/birt/plugins/org.jboss.tools.birt.oda.ui/about.ini
trunk/birt/plugins/org.jboss.tools.birt.oda.ui/build.properties
Log:
JBIDE-3240 Changing the icon for the birt, portlet and project-examples feature
Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/about.ini
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/about.ini 2008-11-20 18:45:02 UTC (rev 11925)
+++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/about.ini 2008-11-20 19:02:29 UTC (rev 11926)
@@ -11,7 +11,7 @@
# needed for primary features only
# Property "featureImage" contains path to feature image (32x32)
-featureImage=rhds_wiz.png
+featureImage=jboss_about.png
# Property "aboutImage" contains path to product image (500x330 or 115x164)
# needed for primary features only
Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/build.properties
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/build.properties 2008-11-20 18:45:02 UTC (rev 11925)
+++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/build.properties 2008-11-20 19:02:29 UTC (rev 11926)
@@ -9,4 +9,5 @@
about.mappings,\
about.ini,\
about.html,\
- rhds_wiz.png
+ rhds_wiz.png,\
+ jboss_about.png
Added: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/jboss_about.png
===================================================================
(Binary files differ)
Property changes on: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/jboss_about.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/rhds_wiz.png
===================================================================
(Binary files differ)
17 years, 5 months
JBoss Tools SVN: r11925 - in trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-11-20 13:45:02 -0500 (Thu, 20 Nov 2008)
New Revision: 11925
Added:
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/plugin.properties
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/Messages.java
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/messages.properties
Modified:
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/build.properties
trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java
Log:
JBIDE-3243 Internationalize the org.jboss.tools.xulrunner.initializer plugin
Modified: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/META-INF/MANIFEST.MF 2008-11-20 18:18:11 UTC (rev 11924)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/META-INF/MANIFEST.MF 2008-11-20 18:45:02 UTC (rev 11925)
@@ -1,8 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: XULRunner Initializer
+Bundle-Name: %BundleName
Bundle-SymbolicName: org.jboss.tools.xulrunner.initializer
Bundle-Version: 1.0.0
-Bundle-Vendor: Red Hat, Inc.
+Bundle-Vendor: %BundleVendor
Fragment-Host: org.eclipse.swt
Require-Bundle: org.eclipse.core.runtime
+Bundle-Localization: plugin
Modified: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/build.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/build.properties 2008-11-20 18:18:11 UTC (rev 11924)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/build.properties 2008-11-20 18:45:02 UTC (rev 11925)
@@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ plugin.properties
Added: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/plugin.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/plugin.properties (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/plugin.properties 2008-11-20 18:45:02 UTC (rev 11925)
@@ -0,0 +1,3 @@
+#Properties file for org.jboss.tools.xulrunner.initializer
+BundleVendor = JBoss, a division of Red Hat
+BundleName =XULRunner Initializer
\ No newline at end of file
Added: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/Messages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/Messages.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/Messages.java 2008-11-20 18:45:02 UTC (rev 11925)
@@ -0,0 +1,17 @@
+package org.eclipse.swt.browser;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.swt.browser.messages"; //$NON-NLS-1$
+ public static String XULRunnerInitializer_Bundle_doesnt_contain;
+ public static String XULRunnerInitializer_Bundle_is_not_found;
+ public static String XULRunnerInitializer_Cannot_get_path_to_XULRunner_from_bundle;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
Modified: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java 2008-11-20 18:18:11 UTC (rev 11924)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/XULRunnerInitializer.java 2008-11-20 18:45:02 UTC (rev 11925)
@@ -6,12 +6,13 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.osgi.util.NLS;
import org.osgi.framework.Bundle;
public class XULRunnerInitializer {
- private static final String XULRUNNER_PATH = "org.eclipse.swt.browser.XULRunnerPath";
- private static final String XULRUNNER_ENTRY = "/xulrunner";
+ private static final String XULRUNNER_PATH = "org.eclipse.swt.browser.XULRunnerPath"; //$NON-NLS-1$
+ private static final String XULRUNNER_ENTRY = "/xulrunner"; //$NON-NLS-1$
static {
String xulrunnerPath = System.getProperty(XULRUNNER_PATH);
@@ -22,20 +23,20 @@
}
}
if (xulrunnerPath == null) {
- String XULRUNNER_BUNDLE = (new StringBuffer("org.mozilla.xulrunner"))
- .append(".")
+ String XULRUNNER_BUNDLE = (new StringBuffer("org.mozilla.xulrunner")) //$NON-NLS-1$
+ .append(".") //$NON-NLS-1$
.append(Platform.getWS())
- .append(".")
+ .append(".") //$NON-NLS-1$
.append(Platform.getOS())
- .append(Platform.OS_MACOSX.equals(Platform.getOS()) ? "" : (new StringBuffer(".")).append(Platform.getOSArch()).toString())
+ .append(Platform.OS_MACOSX.equals(Platform.getOS()) ? "" : (new StringBuffer(".")).append(Platform.getOSArch()).toString()) //$NON-NLS-1$ //$NON-NLS-2$
.toString();
Bundle xulRunnerBundle = Platform.getBundle(XULRUNNER_BUNDLE);
if (xulRunnerBundle == null) {
- System.out.println("Bundle " + XULRUNNER_BUNDLE + " is not found.");
+ System.out.println(NLS.bind(Messages.XULRunnerInitializer_Bundle_is_not_found, XULRUNNER_BUNDLE )); //$NON-NLS-2$
} else {
URL url = xulRunnerBundle.getEntry(XULRUNNER_ENTRY);
if (url == null) {
- System.out.println("Bundle " + XULRUNNER_BUNDLE + " doesn't contain " + XULRUNNER_ENTRY);
+ System.out.println(NLS.bind(Messages.XULRunnerInitializer_Bundle_doesnt_contain, new Object[] {XULRUNNER_BUNDLE,XULRUNNER_ENTRY})); //$NON-NLS-2$
} else {
File xulrunnerFile;
try {
@@ -45,7 +46,7 @@
xulrunnerPath = xulrunnerFile.getAbsolutePath();
System.setProperty(XULRUNNER_PATH, xulrunnerPath);
} catch (IOException ioe) {
- System.out.println("Cannot get path to XULRunner from bundle " + XULRUNNER_BUNDLE);
+ System.out.println(NLS.bind(Messages.XULRunnerInitializer_Cannot_get_path_to_XULRunner_from_bundle,XULRUNNER_BUNDLE));
ioe.printStackTrace();
}
}
Added: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/messages.properties (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/src/org/eclipse/swt/browser/messages.properties 2008-11-20 18:45:02 UTC (rev 11925)
@@ -0,0 +1,3 @@
+XULRunnerInitializer_Bundle_doesnt_contain=Bundle {0} doesn''t contain {1}.
+XULRunnerInitializer_Bundle_is_not_found=Bundle {0} is not found.
+XULRunnerInitializer_Cannot_get_path_to_XULRunner_from_bundle=Cannot get path to XULRunner from bundle {0}.
17 years, 5 months
JBoss Tools SVN: r11924 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-11-20 13:18:11 -0500 (Thu, 20 Nov 2008)
New Revision: 11924
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBeanPropertyResource.java
Log:
JBIDE-3189 CA remove first entered el expression
Issue is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBeanPropertyResource.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBeanPropertyResource.java 2008-11-20 18:13:51 UTC (rev 11923)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPKbdBeanPropertyResource.java 2008-11-20 18:18:11 UTC (rev 11924)
@@ -25,6 +25,7 @@
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
import org.jboss.tools.common.el.core.model.ELModel;
import org.jboss.tools.common.el.core.model.ELPropertyInvocation;
+import org.jboss.tools.common.el.core.model.ELUtil;
import org.jboss.tools.common.el.core.parser.ELParser;
import org.jboss.tools.common.el.core.parser.ELParserFactory;
import org.jboss.tools.common.el.core.parser.ELParserUtil;
@@ -182,24 +183,27 @@
ELParser p = ELParserUtil.getDefaultFactory().createParser();
ELModel model = p.parse(value);
List<ELInstance> is = model.getInstances();
- ELInvocationExpression expr = null;
- for (ELInstance i: is) {
- if(i.getExpression() instanceof ELInvocationExpression) {
- expr = (ELInvocationExpression)i.getExpression();
- break;
- }
+ ELExpression expr = null;
+
+ // JBIDE-3189: CA remove first entered el expression
+ // The following fixes the issue
+ ELInstance i = ELUtil.findInstance(model, offset);
+ if (i != null) {
+ expr = (ELExpression)i.getExpression();
}
+ // JBIDE-3189
+
if(expr != null) {
proposal.setStart(expr.getStartPosition());
} else {
proposal.setStart(offset);
}
- if(expr != null && expr.getEndPosition() >= offset) {
- proposal.setEnd(expr.getEndPosition());
- } else {
- proposal.setEnd(offset);
- }
+ // JBIDE-3189: CA remove first entered el expression
+ // The following fixes the issue
+ proposal.setEnd(offset);
+ // JBIDE-3189
+
int pos = proposal.getReplacementString().length();
// JBIDE-2437: Because of the issue add EL open/close brackets to the proposal replacement string
17 years, 5 months