[jbosstools-commits] JBoss Tools SVN: r12985 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui and 1 other directory.
Author: rob.stryker(a)jboss.com
Date: 2009-01-12 01:59:15 -0500 (Mon, 12 Jan 2009)
New Revision: 12985
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/ServerContentProvider.java
Log:
JBIDE-3421 - unable to expand fileset fixed
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java 2009-01-11
16:52:26 UTC (rev 12984)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java 2009-01-12
06:59:15 UTC (rev 12985)
@@ -38,6 +38,16 @@
public String getLocalizedResourceName() {
return path.toOSString();
}
+
+ public boolean equals(Object o) {
+ return o == null ? false :
+ !(o instanceof PathWrapper) ? false :
+ ((PathWrapper)o).folder.equals(folder) &&
((PathWrapper)o).path.equals(path);
+ }
+
+ public int hashCode() {
+ return path.hashCode() + folder.hashCode();
+ }
}
public static class FolderWrapper extends PathWrapper {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/ServerContentProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/ServerContentProvider.java 2009-01-11
16:52:26 UTC (rev 12984)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/ServerContentProvider.java 2009-01-12
06:59:15 UTC (rev 12985)
@@ -257,6 +257,21 @@
job.schedule();
}
+ protected void updateServerLabel(final IServer server) {
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ try {
+ if( viewer != null && !viewer.getControl().isDisposed()) {
+ viewer.update(server, null);
+ ServerDecorator.getDefault().redecorate(server);
+ }
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+ });
+ }
+
protected void refreshServer(final IServer server) {
refreshServer(server, false);
}
@@ -315,7 +330,7 @@
IServer server = ServerCore.findServer(servers[i]);
if (server != null ) {
ServerDecorator.animate();
- refreshServer(server);
+ updateServerLabel(server);
}
}
} catch (Exception e) {