[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers ...
Robert Stryker
rawblem at gmail.com
Thu Dec 14 14:34:44 EST 2006
User: rawb
Date: 06/12/14 14:34:44
Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers
InactiveExtensionViewProvider.java
DescriptorXPathViewProvider.java
FilesetViewProvider.java
Log:
flickering view caused by input being set all over the place. Had to be remedied. It's possible this change breaks something else which depended on that behavior, but if it does I'll find it ;)
Also, API change which allows removal and addition of items without doing a tree refresh (more efficient)
Revision Changes Path
1.2 +1 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/InactiveExtensionViewProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InactiveExtensionViewProvider.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/InactiveExtensionViewProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- InactiveExtensionViewProvider.java 10 Nov 2006 00:30:21 -0000 1.1
+++ InactiveExtensionViewProvider.java 14 Dec 2006 19:34:44 -0000 1.2
@@ -119,7 +119,7 @@
inputChanged(JBossServerView.getDefault().getJBViewer(), null, JBossServerView.getDefault().getSelectedServer());
try {
- JBossServerView.getDefault().refreshJBTree(null);
+ JBossServerView.getDefault().getJBViewer().refresh();
} catch(Exception e) {
}
}
1.5 +1 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DescriptorXPathViewProvider.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- DescriptorXPathViewProvider.java 4 Dec 2006 17:46:39 -0000 1.4
+++ DescriptorXPathViewProvider.java 14 Dec 2006 19:34:44 -0000 1.5
@@ -1013,7 +1013,7 @@
protected void refreshViewer() {
if( isEnabled() ) {
try {
- JBossServerView.getDefault().refreshJBTree(provider);
+ refreshViewer();
if( propertyPage != null ) {
propertyPage.xpathTreeViewer.refresh();
}
1.2 +43 -33 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FilesetViewProvider.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- FilesetViewProvider.java 13 Dec 2006 18:32:51 -0000 1.1
+++ FilesetViewProvider.java 14 Dec 2006 19:34:44 -0000 1.2
@@ -50,6 +50,7 @@
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.JBossServer;
import org.jboss.ide.eclipse.as.core.server.ServerAttributeHelper;
+import org.jboss.ide.eclipse.as.ui.views.server.JBossServerView;
import org.jboss.ide.eclipse.as.ui.views.server.extensions.ServerViewProvider;
import org.jboss.ide.eclipse.as.ui.views.server.extensions.SimplePropertiesViewExtension;
import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
@@ -82,7 +83,8 @@
System.arraycopy(filesets, 0, filesetsNew, 0, filesets.length);
filesetsNew[filesetsNew.length-1] = fs;
filesets = filesetsNew;
- saveFilesets();
+ saveFilesets(true);
+ refreshViewer();
}
}
};
@@ -94,7 +96,8 @@
ArrayList asList = new ArrayList(Arrays.asList(filesets));
asList.remove(selection);
filesets = (Fileset[]) asList.toArray(new Fileset[asList.size()]);
- saveFilesets();
+ saveFilesets(true);
+ removeElement(selection);
} catch( Exception e ) {
e.printStackTrace();
}
@@ -112,7 +115,8 @@
sel.setFolder(ret.getFolder());
sel.setIncludesPattern(ret.getIncludesPattern());
sel.setExcludesPattern(ret.getExcludesPattern());
- saveFilesets();
+ saveFilesets(true);
+ refreshViewer(sel);
}
}
};
@@ -123,6 +127,7 @@
PathWrapper wrapper = (PathWrapper)selection;
File file = wrapper.getPath().toFile();
file.delete();
+ refreshViewer();
} catch( Exception e ) {
}
}
@@ -230,7 +235,9 @@
}
}
- public void saveFilesets() {
+ public void saveFilesets(boolean suppressRefresh) {
+ Runnable r = new Runnable() {
+ public void run() {
IServer server = contentProvider.server;
if( server != null ) {
ArrayList list = new ArrayList();
@@ -243,6 +250,14 @@
helper.save();
}
}
+ };
+
+ if( suppressRefresh ) {
+ suppressingRefresh(r);
+ } else {
+ r.run();
+ }
+ }
public class Fileset implements Cloneable {
private String name, folder, includesPattern, excludesPattern;
@@ -327,6 +342,17 @@
} catch( Exception e ) {}
return null;
}
+
+ public boolean equals(Object other) {
+ if( !(other instanceof Fileset)) return false;
+ if( other == this ) return true;
+ Fileset o = (Fileset)other;
+ return o.getName().equals(getName()) && o.getFolder().equals(getFolder())
+ && o.getIncludesPattern().equals(getIncludesPattern()) && o.getExcludesPattern().equals(getExcludesPattern());
+ }
+ public int hashCode() {
+ return (name + "::_::" + folder + "::_::" + includesPattern + "::_::" + excludesPattern + "::_::").hashCode();
+ }
}
public class FilesetLabelProvider extends LabelProvider {
@@ -349,22 +375,6 @@
}
return image;
}
-// if( element instanceof Path ) {
-// ((Path)element).
-//
-// }
-// if (resource instanceof IFile) {
-// contentType = IDE.guessContentType((IFile)resource);
-// }
-// // @issue move IDE specific images
-// ImageDescriptor image = PlatformUI.getWorkbench().getEditorRegistry()
-// .getImageDescriptor(resource.getName(), contentType);
-// if (image == null) {
-// image = PlatformUI.getWorkbench().getSharedImages()
-// .getImageDescriptor(ISharedImages.IMG_OBJ_FILE);
-// }
-// return image;
-
return null;
}
@@ -478,26 +488,26 @@
}
protected void fillArea(Composite main) {
Label nameLabel = new Label(main, SWT.NONE);
- nameLabel.setText("Name");
+ nameLabel.setText("Name: ");
nameText = new Text(main, SWT.BORDER);
nameText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true, 2, 1));
Label folderLabel = new Label(main, SWT.NONE);
- folderLabel.setText("Folder");
+ folderLabel.setText("Root Directory: ");
folderText = new Text(main, SWT.BORDER);
browse = new Button(main, SWT.PUSH);
browse.setText("Browse...");
Label includesLabel = new Label(main, SWT.NONE);
- includesLabel.setText("Include Pattern");
+ includesLabel.setText("Includes: ");
includesText = new Text(main, SWT.BORDER);
includesText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true, 2, 1));
Label excludeLabel= new Label(main, SWT.NONE);
- excludeLabel.setText("Exclude Pattern");
+ excludeLabel.setText("Excludes: ");
excludesText = new Text(main, SWT.BORDER);
excludesText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true, 2, 1));
More information about the jboss-cvs-commits
mailing list