[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
Fri Dec 22 18:26:35 EST 2006
User: rawb
Date: 06/12/22 18:26:35
Modified: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers
DescriptorXPathViewProvider.java
FilesetViewProvider.java ModuleViewProvider.java
EventLogViewProvider.java
Removed: as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers
PackageBuildLabelProvider.java
PollingLabelProvider.java
Log:
Added deploy-only server (cannot start or stop)
Other associated changes.
Revision Changes Path
1.6 +7 -4 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- DescriptorXPathViewProvider.java 14 Dec 2006 19:34:44 -0000 1.5
+++ DescriptorXPathViewProvider.java 22 Dec 2006 23:26:35 -0000 1.6
@@ -150,8 +150,11 @@
protected class XPathTreeContentProvider implements ITreeContentProvider {
public Object[] getChildren(Object parentElement) {
- if( parentElement instanceof ServerViewProvider )
- return getRoot().getChildren();
+ if( parentElement instanceof ServerViewProvider ) {
+ SimpleXPathPreferenceTreeItem root = getRoot();
+ if( root == null ) return new Object[]{};
+ return root.getChildren();
+ }
return new Object[0];
}
public Object getParent(Object element) {
@@ -168,7 +171,7 @@
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
if( oldInput != newInput ) {
server = (IServer)newInput;
- jbServer = server == null ? null : JBossServerCore.getServer(server);
+ jbServer = server == null ? null : JBossServerCore.getJBossServer(server);
root = null;
}
}
@@ -195,7 +198,7 @@
}
public SimpleXPathPreferenceTreeItem getRoot() {
- if( root == null ) {
+ if( root == null && jbServer != null) {
root = jbServer.getAttributeHelper().getXPathPreferenceTree();
}
return root;
1.3 +20 -8 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- FilesetViewProvider.java 14 Dec 2006 19:34:44 -0000 1.2
+++ FilesetViewProvider.java 22 Dec 2006 23:26:35 -0000 1.3
@@ -29,6 +29,7 @@
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -48,9 +49,8 @@
import org.eclipse.ui.internal.editors.text.JavaFileEditorInput;
import org.eclipse.ui.internal.util.SWTResourceUtil;
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.core.server.attributes.IDeployableServer;
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;
@@ -75,7 +75,7 @@
protected void createActions() {
createFilter = new Action() {
public void run() {
- JBossServer server = (JBossServer)contentProvider.server.loadAdapter(JBossServer.class, new NullProgressMonitor());
+ IDeployableServer server = (IDeployableServer)contentProvider.server.loadAdapter(IDeployableServer.class, new NullProgressMonitor());
FilesetDialog d = new FilesetDialog(new Shell(), server);
if( d.open() == Window.OK ) {
Fileset fs = d.getFileset();
@@ -224,7 +224,7 @@
public void loadFilesets() {
IServer server = contentProvider.server;
if( server != null ) {
- JBossServer jbs = (JBossServer)server.loadAdapter(JBossServer.class, new NullProgressMonitor());
+ IDeployableServer jbs = (IDeployableServer)server.loadAdapter(IDeployableServer.class, new NullProgressMonitor());
ServerAttributeHelper helper = jbs.getAttributeHelper();
List tmp = helper.getAttribute(FILESET_KEY, new ArrayList());
String[] asStrings = (String[]) tmp.toArray(new String[tmp.size()]);
@@ -244,7 +244,7 @@
for( int i = 0; i < filesets.length; i++ ) {
list.add(filesets[i].toString());
}
- JBossServer jbs = (JBossServer)server.loadAdapter(JBossServer.class, new NullProgressMonitor());
+ IDeployableServer jbs = (IDeployableServer)server.loadAdapter(IDeployableServer.class, new NullProgressMonitor());
ServerAttributeHelper helper = jbs.getAttributeHelper();
helper.setAttribute(FILESET_KEY, list);
helper.save();
@@ -427,7 +427,8 @@
private String name, dir, includes, excludes;
private Button browse;
private Text includesText, excludesText, folderText, nameText;
- protected FilesetDialog(Shell parentShell, JBossServer server) {
+ private Composite main;
+ protected FilesetDialog(Shell parentShell, IDeployableServer server) {
super(parentShell);
this.fileset = new Fileset();
this.fileset.setFolder(server.getDeployDirectory());
@@ -436,11 +437,17 @@
super(parentShell);
this.fileset = (Fileset)fileset.clone();
}
+ protected Point getInitialSize() {
+ //return new Point(400, 150);
+ Point p = super.getInitialSize();
+ return new Point(500, p.y);
+ }
+
protected Control createDialogArea(Composite parent) {
Composite sup = (Composite) super.createDialogArea(parent);
- Composite main = new Composite(sup, SWT.NONE);
+ main = new Composite(sup, SWT.NONE);
main.setLayout(new GridLayout(3, false));
-
+ main.setLayoutData(new GridData(GridData.FILL_BOTH));
fillArea(main);
nameText.setText(fileset.getName());
@@ -476,6 +483,10 @@
});
}
+ protected void layout() {
+ int o, t;
+ }
+
protected void textModified() {
name = nameText.getText();
dir = folderText.getText();
@@ -497,6 +508,7 @@
folderLabel.setText("Root Directory: ");
folderText = new Text(main, SWT.BORDER);
+ folderText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true, 1, 1));
browse = new Button(main, SWT.PUSH);
browse.setText("Browse...");
1.3 +2 -2 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ModuleViewProvider.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/ModuleViewProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ModuleViewProvider.java 28 Nov 2006 17:34:30 -0000 1.2
+++ ModuleViewProvider.java 22 Dec 2006 23:26:35 -0000 1.3
@@ -226,13 +226,13 @@
private void addListeners() {
serverResourceListener = new IServerLifecycleListener() {
public void serverAdded(IServer server) {
- if( JBossServerCore.getServer(server) != null )
+ if( JBossServerCore.getJBossServer(server) != null )
server.addServerListener(serverListener);
}
public void serverChanged(IServer server) {
}
public void serverRemoved(IServer server) {
- if( JBossServerCore.getServer(server) != null )
+ if( JBossServerCore.getJBossServer(server) != null )
server.removeServerListener(serverListener);
}
};
1.6 +3 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/EventLogViewProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EventLogViewProvider.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/EventLogViewProvider.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- EventLogViewProvider.java 11 Dec 2006 15:53:03 -0000 1.5
+++ EventLogViewProvider.java 22 Dec 2006 23:26:35 -0000 1.6
@@ -244,7 +244,9 @@
for( int i = 0; i < elements.length; i++ ) {
try {
labelProviderDelegates[i] = (IEventLogLabelProvider)elements[i].createExecutableExtension("class");
- } catch( CoreException ce ) {}
+ } catch( CoreException ce ) {
+ ce.printStackTrace();
+ }
}
}
}
More information about the jboss-cvs-commits
mailing list