2:58 a.m.
Author: rob.stryker(a)jboss.com
Date: 2012-10-17 03:58:36 -0400 (Wed, 17 Oct 2012)
New Revision: 44555
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractPublishMethod.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
Log:
JBIDE-10592 to trunk
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractPublishMethod.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractPublishMethod.java 2012-10-17
06:08:24 UTC (rev 44554)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractPublishMethod.java 2012-10-17
07:58:36 UTC (rev 44555)
@@ -59,6 +59,7 @@
// kind = [incremental, full, auto, clean] = [1,2,3,4]
// delta = [no_change, added, changed, removed] = [0,1,2,3]
+ // modulePublish= [unknown, none, incremental full] = [0,1,2,3]
if( module.length == 0 ) return IServer.PUBLISH_STATE_NONE;
int modulePublishState = behaviour.getServer().getModulePublishState(module);
int publishType = behaviour.getPublishType(kind, deltaKind, modulePublishState);
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2012-10-17
06:08:24 UTC (rev 44554)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2012-10-17
07:58:36 UTC (rev 44555)
@@ -16,6 +16,7 @@
import java.util.ArrayList;
import java.util.HashMap;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.viewers.CellEditor;
@@ -139,6 +140,7 @@
// Combo strings - TODO extract to messages
private static final String ALL = "All";
+ private static final String DEPLOYABLE = "Deployable";
private static final String DEPLOYED = "Deployed";
private static final String BY_MODNAME = "By Module Name";
private static final String BY_MODTYPE = "By Module Type";
@@ -763,7 +765,7 @@
Label comboLabel = new Label(root, SWT.NULL);
comboLabel.setText("Filter by:");
filterCombo = new Combo(root, SWT.READ_ONLY);
- filterCombo.setItems(new String[]{ALL, DEPLOYED, BY_MODNAME});
+ filterCombo.setItems(new String[]{ALL, DEPLOYABLE, DEPLOYED, BY_MODNAME});
filterCombo.select(0);
filterText = new Text(root, SWT.SINGLE |SWT.BORDER);
@@ -780,7 +782,7 @@
};
filterCombo.addModifyListener(ml);
filterText.addModifyListener(ml);
- filterCombo.select(1); // select DEPLOYED
+ filterCombo.select(1); // select DEPLOYABLE
return root;
}
@@ -875,18 +877,31 @@
return page.getPossibleModules();
if( filterCombo.getItem(filterCombo.getSelectionIndex()).equals(DEPLOYED))
return page.getServer().getModules();
- if( filterCombo.getItem(filterCombo.getSelectionIndex()).equals(BY_MODNAME)) {
+ else {
IModule[] mods = page.getPossibleModules();
- String txt = filterText.getText();
ArrayList<IModule> result = new ArrayList<IModule>();
- for( int i = 0; i < mods.length; i++) {
- if( mods[i].getName().startsWith(txt)) {
- result.add(mods[i]);
+ if( filterCombo.getItem(filterCombo.getSelectionIndex()).equals(DEPLOYABLE)) {
+ for( int i = 0; i < mods.length; i++) {
+ try {
+ IModule[] parent = page.getServer().getRootModules(mods[i], new
NullProgressMonitor());
+ if( parent.length == 1 && parent[0] == mods[i]) {
+ result.add(mods[i]);
+ }
+ } catch(CoreException ce) {
+ ce.printStackTrace();
+ }
}
}
+ if( filterCombo.getItem(filterCombo.getSelectionIndex()).equals(BY_MODNAME)) {
+ String txt = filterText.getText();
+ for( int i = 0; i < mods.length; i++) {
+ if( mods[i].getName().contains(txt)) {
+ result.add(mods[i]);
+ }
+ }
+ }
return result.toArray(new IModule[result.size()]);
}
- return new Object[]{};
}
private class ModulePageLabelProvider implements ITableLabelProvider {
@@ -963,7 +978,10 @@
public static String getDefaultOutputName(IModule module) {
- return new Path(module.getName()).lastSegment() +
PublishUtil.getSuffix(module.getModuleType().getId());
+ String lastSegment = new Path(module.getName()).lastSegment();
+ String suffix = PublishUtil.getSuffix(module.getModuleType().getId());
+ String ret = lastSegment.endsWith(suffix) ? lastSegment : lastSegment + suffix;
+ return ret;
}
protected static String getOutputFolderAndName(DeploymentModulePrefs modPref, IModule m)
{
@@ -983,7 +1001,6 @@
metadataRadio, serverRadio, customRadio, currentSelection,
deployButton, tempDeployButton,zipDeployWTPProjects
};
- System.out.println("Setting enablement to " + enabled);
for( int i = 0; i < c.length; i++ ) {
if( c[i] != null && !c[i].isDisposed()) {
c[i].setEnabled(enabled);