[jbosstools-commits] JBoss Tools SVN: r2010 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers.
Author: rob.stryker(a)jboss.com
Date: 2007-05-07 16:02:32 -0400 (Mon, 07 May 2007)
New Revision: 2010
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java
Log:
null pointer exceptions
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java 2007-05-07
18:46:06 UTC (rev 2009)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java 2007-05-07
20:02:32 UTC (rev 2010)
@@ -30,6 +30,7 @@
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -54,6 +55,7 @@
import org.jboss.ide.eclipse.archives.ui.util.composites.FilesetPreviewComposite;
import org.jboss.ide.eclipse.as.core.server.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer;
+import org.jboss.ide.eclipse.as.ui.Messages;
import org.jboss.ide.eclipse.as.ui.views.server.extensions.ServerViewProvider;
import
org.jboss.ide.eclipse.as.ui.views.server.extensions.SimplePropertiesViewExtension;
@@ -177,11 +179,12 @@
* @return the path
*/
public IPath getPath() {
- return path;
+ return new Path(folder).append(path);
}
public String getLocalizedResourceName() {
- return path.toOSString().substring(new Path(folder).toOSString().length());
+ //return path.toOSString().substring(new Path(folder).toOSString().length());
+ return path.toOSString();
}
}
public class FilesetContentProvider implements ITreeContentProvider {
@@ -453,6 +456,10 @@
return super.getShellStyle() | SWT.RESIZE;
}
+ protected void configureShell(Shell shell) {
+ super.configureShell(shell);
+ shell.setText("New Fileset");
+ }
protected Control createDialogArea(Composite parent) {
Composite sup = (Composite) super.createDialogArea(parent);
@@ -536,7 +543,7 @@
previewWrapper.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true, 3, 3));
previewWrapper.setText("Preview");
- previewWrapper.setLayout(new GridLayout(1, false));
+ previewWrapper.setLayout(new FillLayout());
preview = new FilesetPreviewComposite(previewWrapper, SWT.NONE);
}