JBoss Tools SVN: r31882 - trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-06-07 14:40:14 -0400 (Tue, 07 Jun 2011)
New Revision: 31882
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java
Log:
@Override for interface method removed to fix continuous build
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java 2011-06-07 18:29:29 UTC (rev 31881)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/creation/ui/widgets/Java2WSDLCodeGenConfigWidget.java 2011-06-07 18:40:14 UTC (rev 31882)
@@ -58,7 +58,6 @@
//choose source folder
sourceCombo = JBossCreationUIUtils.createComboItem(configCom, model,JBossWSCreationCoreMessages.Label_SourceFolder_Name ,JBossWSCreationCoreMessages.Tooltip_SourceFolder);
sourceCombo.addListener(SWT.Modify, new Listener(){
- @Override
public void handleEvent(Event arg0) {
String javaSourceFolder = sourceCombo.getText();
model.setJavaSourceFolder(javaSourceFolder);
14 years, 10 months
JBoss Tools SVN: r31881 - in trunk/runtime: plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-06-07 14:29:29 -0400 (Tue, 07 Jun 2011)
New Revision: 31881
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java
trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/RuntimePath.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/EditRuntimePathDialog.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/RuntimePathEditingSupport.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java
trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java
Log:
JBIDE-9084 [runtimes] Adding duplicate folders should't be allowed
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-06-07 18:06:36 UTC (rev 31880)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-06-07 18:29:29 UTC (rev 31881)
@@ -318,6 +318,10 @@
// Don't create the driver a few times
return;
}
+ if (index == 8) {
+ // AS 7
+ return;
+ }
String driverPath;
try {
driverPath = new File(jbossASLocation + JBOSS_AS_HSQL_DRIVER_LOCATION[index]).getCanonicalPath(); //$NON-NLS-1$
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/RuntimePath.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/RuntimePath.java 2011-06-07 18:06:36 UTC (rev 31880)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/model/RuntimePath.java 2011-06-07 18:29:29 UTC (rev 31881)
@@ -94,4 +94,29 @@
this.timestamp = timestamp;
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((path == null) ? 0 : path.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ RuntimePath other = (RuntimePath) obj;
+ if (path == null) {
+ if (other.path != null)
+ return false;
+ } else if (!path.equals(other.path))
+ return false;
+ return true;
+ }
+
}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java 2011-06-07 18:06:36 UTC (rev 31880)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java 2011-06-07 18:29:29 UTC (rev 31881)
@@ -11,6 +11,7 @@
package org.jboss.tools.runtime.ui;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -67,7 +68,7 @@
}
private boolean runtimeExists(boolean firstStart, IProgressMonitor monitor) {
- List<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault().getRuntimePaths();
+ Set<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault().getRuntimePaths();
for (RuntimePath runtimePath:runtimePaths) {
if (!firstStart && !runtimePath.isScanOnEveryStartup()) {
continue;
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java 2011-06-07 18:06:36 UTC (rev 31880)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeUIActivator.java 2011-06-07 18:29:29 UTC (rev 31881)
@@ -18,6 +18,7 @@
import java.io.Writer;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -108,7 +109,7 @@
private static final String RUNTIME_PREFERENCES_VERSION = "2"; //$NON-NLS-1$
- private List<RuntimePath> runtimePaths = new ArrayList<RuntimePath>();
+ private Set<RuntimePath> runtimePaths = new HashSet<RuntimePath>();
private Set<IRuntimeDetector> runtimeDetectors;
@@ -161,7 +162,7 @@
RuntimeUIActivator.getDefault().getLog().log(status);
}
- public static CheckboxTreeViewer createRuntimeViewer(final List<RuntimePath> runtimePaths2, Composite composite, int heightHint) {
+ public static CheckboxTreeViewer createRuntimeViewer(final Set<RuntimePath> runtimePaths2, Composite composite, int heightHint) {
GridData gd;
CheckboxTreeViewer viewer = new CheckboxTreeViewer(composite, SWT.V_SCROLL
| SWT.BORDER | SWT.FULL_SELECTION | SWT.SINGLE);
@@ -198,7 +199,7 @@
return viewer;
}
- public static void refreshRuntimes(Shell shell, final List<RuntimePath> runtimePaths, final CheckboxTreeViewer viewer, boolean needRefresh, int heightHint) {
+ public static void refreshRuntimes(Shell shell, final Set<RuntimePath> runtimePaths, final CheckboxTreeViewer viewer, boolean needRefresh, int heightHint) {
IRunnableWithProgress op = new IRunnableWithProgress() {
@Override
@@ -282,7 +283,7 @@
}
private void initRuntimePaths() throws WorkbenchException {
- runtimePaths = new ArrayList<RuntimePath>();
+ runtimePaths = new HashSet<RuntimePath>();
String runtimes = getPreferences().get(RUNTIME_PATHS, null);
if (runtimes == null || runtimes.isEmpty()) {
return;
@@ -354,7 +355,7 @@
private static IEclipsePreferences getPreferences() {
if (prefs == null) {
- prefs = new ConfigurationScope().getNode(PLUGIN_ID);
+ prefs = ConfigurationScope.INSTANCE.getNode(PLUGIN_ID);
}
return prefs;
}
@@ -418,13 +419,13 @@
node.putBoolean(ENABLED, serverDefinition.isEnabled());
}
- public List<RuntimePath> getRuntimePaths() {
+ public Set<RuntimePath> getRuntimePaths() {
if (runtimePaths == null) {
try {
initRuntimePaths();
} catch (WorkbenchException e) {
log(e);
- runtimePaths = new ArrayList<RuntimePath>();
+ runtimePaths = new HashSet<RuntimePath>();
}
}
return runtimePaths;
@@ -450,11 +451,11 @@
}
public void initDefaultRuntimePreferences() {
- runtimePaths = new ArrayList<RuntimePath>();
+ runtimePaths = new HashSet<RuntimePath>();
runtimeDetectors = RuntimeCoreActivator.getDeclaredRuntimeDetectors();
}
- public static void setTimestamp(List<RuntimePath> runtimePaths2) {
+ public static void setTimestamp(Set<RuntimePath> runtimePaths2) {
for (RuntimePath runtimePath : runtimePaths2) {
String path = runtimePath.getPath();
if (path != null && !path.isEmpty()) {
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/EditRuntimePathDialog.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/EditRuntimePathDialog.java 2011-06-07 18:06:36 UTC (rev 31880)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/EditRuntimePathDialog.java 2011-06-07 18:29:29 UTC (rev 31881)
@@ -11,8 +11,8 @@
package org.jboss.tools.runtime.ui.dialogs;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogSettings;
@@ -44,7 +44,7 @@
public class EditRuntimePathDialog extends Dialog {
private RuntimePath runtimePath;
- private List<RuntimePath> runtimePaths;
+ private Set<RuntimePath> runtimePaths;
private CheckboxTreeViewer treeViewer;
public EditRuntimePathDialog(Shell parentShell, RuntimePath runtimePath) {
@@ -94,7 +94,7 @@
if (path == null) {
return;
}
- List<RuntimePath> runtimePaths2 = new ArrayList<RuntimePath>();
+ Set<RuntimePath> runtimePaths2 = new HashSet<RuntimePath>();
runtimePaths2.add(runtimePath);
RuntimeUIActivator.refreshRuntimes(getShell(), runtimePaths2, null, true, 15);
dialogSettings.put(RuntimeUIActivator.LASTPATH, path);
@@ -132,7 +132,7 @@
});
refreshButton.setEnabled( (new File(pathText.getText()).isDirectory()) );
- List<RuntimePath> runtimePaths = getRuntimePaths();
+ Set<RuntimePath> runtimePaths = getRuntimePaths();
treeViewer = RuntimeUIActivator.createRuntimeViewer(runtimePaths, contents, 100);
treeViewer.addCheckStateListener(new ICheckStateListener() {
@@ -145,9 +145,9 @@
return area;
}
- private List<RuntimePath> getRuntimePaths() {
+ private Set<RuntimePath> getRuntimePaths() {
if (runtimePaths == null) {
- runtimePaths = new ArrayList<RuntimePath>();
+ runtimePaths = new HashSet<RuntimePath>();
runtimePaths.add(runtimePath);
}
return runtimePaths;
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/RuntimePathEditingSupport.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/RuntimePathEditingSupport.java 2011-06-07 18:06:36 UTC (rev 31880)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/RuntimePathEditingSupport.java 2011-06-07 18:29:29 UTC (rev 31881)
@@ -48,6 +48,9 @@
@Override
protected boolean canEdit(Object element) {
+ if (this.column == 0) {
+ return false;
+ }
return true;
}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2011-06-07 18:06:36 UTC (rev 31880)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2011-06-07 18:29:29 UTC (rev 31881)
@@ -12,6 +12,7 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -52,7 +53,7 @@
*/
public class SearchRuntimePathDialog extends ProgressMonitorDialog {
- private List<RuntimePath> runtimePaths = new ArrayList<RuntimePath>();
+ private Set<RuntimePath> runtimePaths = new HashSet<RuntimePath>();
private boolean running = true;
private CheckboxTreeViewer treeViewer;
private boolean canceled;
@@ -62,7 +63,7 @@
private Button hideCreatedRuntimes;
private int heightHint;
- public SearchRuntimePathDialog(Shell parent, List<RuntimePath> runtimePaths, boolean needRefresh, int heightHint) {
+ public SearchRuntimePathDialog(Shell parent, Set<RuntimePath> runtimePaths, boolean needRefresh, int heightHint) {
super(parent);
setShellStyle(SWT.CLOSE | SWT.MAX | SWT.TITLE | SWT.BORDER
| SWT.RESIZE | getDefaultOrientation());
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java 2011-06-07 18:06:36 UTC (rev 31880)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java 2011-06-07 18:29:29 UTC (rev 31881)
@@ -11,8 +11,7 @@
package org.jboss.tools.runtime.ui.preferences;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
import java.util.Set;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -72,9 +71,6 @@
import org.eclipse.ui.dialogs.PreferencesUtil;
import org.jboss.tools.runtime.core.model.IRuntimeDetector;
import org.jboss.tools.runtime.core.model.RuntimePath;
-import org.jboss.tools.runtime.core.model.ServerDefinition;
-import org.jboss.tools.runtime.ui.RuntimeContentProvider;
-import org.jboss.tools.runtime.ui.RuntimeLabelProvider;
import org.jboss.tools.runtime.ui.RuntimeUIActivator;
import org.jboss.tools.runtime.ui.dialogs.AutoResizeTableLayout;
import org.jboss.tools.runtime.ui.dialogs.EditRuntimePathDialog;
@@ -88,7 +84,7 @@
IWorkbenchPreferencePage {
public static String ID = "org.jboss.tools.runtime.preferences.RuntimePreferencePage";
- private List<RuntimePath> runtimePaths = new ArrayList<RuntimePath>();
+ private Set<RuntimePath> runtimePaths = new HashSet<RuntimePath>();
private Image checkboxOn;
private Image checkboxOff;
private Image errorIcon;
@@ -129,82 +125,11 @@
Group detectorGroup = createGroup(composite,1);
detectorGroup.setText("Available runtime detectors");
detectorViewer = createDetectorViewer(detectorGroup);
-
-// Group runtimeDescriptionGroup = createGroup(composite,1);
-// Label runtimeDescription = new Label(runtimeDescriptionGroup, SWT.NONE);
-// runtimeDescription.setText("Runtimes found at the selected path.\n" +
-// "Remove the check mark for any runtimes you do not want identified.");
-// Group runtimeGroup = createGroup(composite,1);
-// final TableViewer runtimesViewer = createRuntimesViewer(runtimeGroup);
-// runtimePathViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-//
-// @Override
-// public void selectionChanged(SelectionChangedEvent event) {
-// runtimesViewer.setInput(getServerDefinitions());
-// }
-// });
-
+
Dialog.applyDialogFont(composite);
return composite;
}
- private TableViewer createRuntimesViewer(Composite parent) {
- CheckboxTableViewer tableViewer = CheckboxTableViewer.newCheckList(parent, SWT.V_SCROLL
- | SWT.BORDER | SWT.FULL_SELECTION | SWT.SINGLE);
- Table table = tableViewer.getTable();
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = 100;
- table.setLayoutData(gd);
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
-
- String[] columnNames = new String[] { "Name", "Version", "Type", "Location", "Description"};
- int[] columnWidths = new int[] { 120, 50, 50, 150, 150};
-
- for (int i = 0; i < columnNames.length; i++) {
- TableColumn tc = new TableColumn(table, SWT.LEFT);
- tc.setText(columnNames[i]);
- tc.setWidth(columnWidths[i]);
- }
-
- tableViewer.setLabelProvider(new RuntimeLabelProvider());
- final List<ServerDefinition> serverDefinitions = getServerDefinitions();
- tableViewer.setContentProvider(new RuntimeContentProvider(serverDefinitions));
- tableViewer.setInput(serverDefinitions);
- for (ServerDefinition definition:serverDefinitions) {
- tableViewer.setChecked(definition, definition.isEnabled());
- }
- tableViewer.addCheckStateListener(new ICheckStateListener() {
-
- public void checkStateChanged(CheckStateChangedEvent event) {
- ServerDefinition definition = (ServerDefinition) event.getElement();
- definition.setEnabled(!definition.isEnabled());
-// boolean enableOk = false;
-// for (ServerDefinition serverDefinition:serverDefinitions) {
-// if (serverDefinition.isEnabled()) {
-// enableOk = true;
-// }
-// }
- }
- });
- return tableViewer;
- }
-
- private List<ServerDefinition> getServerDefinitions() {
- List<ServerDefinition> serverDefinitions = new ArrayList<ServerDefinition>();
- if (runtimePathViewer == null) {
- return serverDefinitions;
- }
- ISelection selection = runtimePathViewer.getSelection();
- if (selection instanceof IStructuredSelection) {
- Object object = ((IStructuredSelection)selection).getFirstElement();
- if (object instanceof RuntimePath) {
- serverDefinitions = ((RuntimePath)object).getServerDefinitions();
- }
- }
- return serverDefinitions;
- }
-
private Group createGroup(Composite composite, int column) {
GridLayout layout;
Group group = new Group(composite, SWT.NONE);
@@ -376,8 +301,12 @@
}
dialogSettings.put(RuntimeUIActivator.LASTPATH, path);
RuntimePath runtimePath = new RuntimePath(path);
- runtimePaths.add(runtimePath);
- List<RuntimePath> runtimePaths2 = new ArrayList<RuntimePath>();
+ boolean exists = runtimePaths.add(runtimePath);
+ if (!exists) {
+ MessageDialog.openInformation(getShell(), "Add Runtime Path", "This runtime path already exists");
+ return;
+ }
+ Set<RuntimePath> runtimePaths2 = new HashSet<RuntimePath>();
runtimePaths2.add(runtimePath);
RuntimeUIActivator.refreshRuntimes(getShell(), runtimePaths2, null, true, 15);
configureSearch();
@@ -411,6 +340,13 @@
EditRuntimePathDialog dialog = new EditRuntimePathDialog(getShell(), runtimePathClone);
int ok = dialog.open();
if (ok == Window.OK) {
+ if (runtimePath.equals(runtimePathClone)) {
+ return;
+ }
+ if (runtimePaths.contains(runtimePathClone)) {
+ MessageDialog.openInformation(getShell(), "Edit Runtime Path", "This runtime path already exists");
+ return;
+ }
runtimePaths.remove(runtimePath);
runtimePath = runtimePathClone;
runtimePaths.add(runtimePath);
Modified: trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java
===================================================================
--- trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java 2011-06-07 18:06:36 UTC (rev 31880)
+++ trunk/runtime/tests/org.jboss.tools.runtime.test/src/org/jboss/tools/runtime/test/RuntimeDetectionTest.java 2011-06-07 18:29:29 UTC (rev 31881)
@@ -75,7 +75,7 @@
}
private static void addRuntimePaths() {
- List<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault()
+ Set<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault()
.getRuntimePaths();
String[] paths = { IRuntimeDetectionConstants.JBOSS_42_HOME,
IRuntimeDetectionConstants.JBOSS_51_HOME,
@@ -102,7 +102,7 @@
private static void createRuntimes() {
JBossRuntimeLocator locator = new JBossRuntimeLocator();
- List<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault()
+ Set<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault()
.getRuntimePaths();
for (RuntimePath runtimePath : runtimePaths) {
List<ServerDefinition> serverDefinitions = locator
@@ -134,7 +134,7 @@
@Test
public void testRuntimePaths() {
- List<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault()
+ Set<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault()
.getRuntimePaths();
assertTrue(
"runtimePaths.size()\nExpected: 6\nWas: " + runtimePaths.size(),
@@ -143,7 +143,7 @@
@Test
public void testRuntimePathsExists() {
- List<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault()
+ Set<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault()
.getRuntimePaths();
for (RuntimePath runtimePath:runtimePaths) {
String path = runtimePath.getPath();
@@ -207,7 +207,7 @@
public void testServerDefinitions() {
List<ServerDefinition> serverDefinitions = RuntimeUIActivator
.getDefault().getServerDefinitions();
- List<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault()
+ Set<RuntimePath> runtimePaths = RuntimeUIActivator.getDefault()
.getRuntimePaths();
assertTrue("serverDefinitions.size()\nExpected: 6\nWas: "
+ serverDefinitions.size() +
14 years, 10 months
JBoss Tools SVN: r31880 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-07 14:06:36 -0400 (Tue, 07 Jun 2011)
New Revision: 31880
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageSelectionProvider.java
Log:
JBIDE-9070
https://issues.jboss.org/browse/JBIDE-9070
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageSelectionProvider.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageSelectionProvider.java 2011-06-07 18:00:32 UTC (rev 31879)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageSelectionProvider.java 2011-06-07 18:06:36 UTC (rev 31880)
@@ -14,9 +14,13 @@
import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
import org.eclipse.core.runtime.ListenerList;
import org.eclipse.core.runtime.SafeRunner;
+import org.eclipse.jface.text.TextSelection;
import org.eclipse.jface.util.Assert;
import org.eclipse.jface.util.SafeRunnable;
import org.eclipse.jface.viewers.*;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
+import org.jboss.tools.common.model.util.PositionSearcher;
/**
*
@@ -78,6 +82,7 @@
}
public void setSelection(ISelection selection) {
+ selection = convertObjectSelection(selection);
if (!isAppropriateSelected(selection))
return;
if (isFiringSelection)
@@ -96,6 +101,27 @@
}
}
+ private ISelection convertObjectSelection(ISelection selection) {
+ if(selection instanceof IStructuredSelection && !selection.isEmpty()
+ && ((IStructuredSelection)selection).getFirstElement() instanceof XModelObject) {
+ XModelObject o = (XModelObject)((IStructuredSelection)selection).getFirstElement();
+ XModelObject f = o;
+ while(f != null && f.getFileType() != XModelObject.FILE) f = f.getParent();
+ if(((JSPMultiPageEditor)multiPageEditor).getModelObject() == f) {
+ String text = ((FileAnyImpl)f).getAsText();
+ PositionSearcher searcher = new PositionSearcher();
+ searcher.init(text, o, null);
+ searcher.execute();
+ int bp = searcher.getStartPosition();
+ int ep = searcher.getEndPosition();
+ if(bp >= 0 && ep >= bp) {
+ selection = new TextSelection(bp, ep - bp);
+ }
+ }
+ }
+ return selection;
+ }
+
private boolean isAppropriateSelected(ISelection selection) {
if (!(selection instanceof IStructuredSelection))
return true;
14 years, 10 months
JBoss Tools SVN: r31879 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-07 14:00:32 -0400 (Tue, 07 Jun 2011)
New Revision: 31879
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java
Log:
JBIDE-9070
https://issues.jboss.org/browse/JBIDE-9070
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java 2011-06-07 16:59:04 UTC (rev 31878)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java 2011-06-07 18:00:32 UTC (rev 31879)
@@ -94,7 +94,7 @@
IComponent[] components = PageProcessor.getInstance().getComponents(query, (IPageContext)context);
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
for(IComponent component : components){
- if(validateComponent(component, ((IPageContext)context).getNameSpaces(reg.getOffset()), query.getPrefix())){
+ if(!component.isExtended() && validateComponent(component, ((IPageContext)context).getNameSpaces(reg.getOffset()), query.getPrefix())){
TLDTagHyperlink link = new TLDTagHyperlink((AbstractComponent)component, reg);
link.setDocument(textViewer.getDocument());
hyperlinks.add(link);
@@ -123,10 +123,10 @@
ELContext context = PageContextFactory.createPageContext(file);
if(context instanceof IPageContext){
- IAttribute[] components = PageProcessor.getInstance().getAttributes(query, (IPageContext)context);
+ IAttribute[] attributes = PageProcessor.getInstance().getAttributes(query, (IPageContext)context);
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
- for(IAttribute attribute : components){
- if(validateComponent(attribute.getComponent(), ((IPageContext)context).getNameSpaces(reg.getOffset()), query.getPrefix())){
+ for(IAttribute attribute : attributes){
+ if(!attribute.isExtended() && validateComponent(attribute.getComponent(), ((IPageContext)context).getNameSpaces(reg.getOffset()), query.getPrefix())){
TLDAttributeHyperlink link = new TLDAttributeHyperlink((AbstractAttribute)attribute, reg);
link.setDocument(textViewer.getDocument());
hyperlinks.add(link);
14 years, 10 months
JBoss Tools SVN: r31878 - trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-06-07 12:59:04 -0400 (Tue, 07 Jun 2011)
New Revision: 31878
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java
Log:
JBIDE-8188 Runtimes preferences page has wrong layout
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java 2011-06-07 12:41:01 UTC (rev 31877)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java 2011-06-07 16:59:04 UTC (rev 31878)
@@ -112,17 +112,18 @@
Composite composite = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout(1, false);
-
+ composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
composite.setLayout(layout);
Group pathsGroup = createGroup(composite,1);
-
+ pathsGroup.setText("Description");
Label pathsDescription = new Label(pathsGroup, SWT.NONE);
pathsDescription.setText("Each path on this list will be automatically scanned for runtimes when\n" +
"a new workspace is created or if selected at every Eclipse startup.\n" +
"Click Edit to configure rules/filters for the search.");
Group pathsTableGroup = createGroup(composite,2);
+ pathsTableGroup.setText("Paths");
runtimePathViewer = createRuntimePathViewer(pathsTableGroup);
Group detectorGroup = createGroup(composite,1);
@@ -207,7 +208,7 @@
private Group createGroup(Composite composite, int column) {
GridLayout layout;
Group group = new Group(composite, SWT.NONE);
- GridData gd = new GridData(SWT.FILL, SWT.FILL, false, false);
+ GridData gd = new GridData(SWT.FILL, SWT.FILL, true, false);
group.setLayoutData(gd);
layout = new GridLayout(column, false);
group.setLayout(layout);
14 years, 10 months
JBoss Tools SVN: r31877 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-06-07 08:41:01 -0400 (Tue, 07 Jun 2011)
New Revision: 31877
Removed:
trunk/bot.tests/
Log:
remove useless folder created for JBIDE-8734
14 years, 10 months
JBoss Tools SVN: r31876 - branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-06-07 07:30:31 -0400 (Tue, 07 Jun 2011)
New Revision: 31876
Added:
branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/NullpluginTest_JBIDE8792.java
Removed:
branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java
Modified:
branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-8792 : Install flash plugin message appears in VPE if on page used flash references
- minor fix, class renamed: NullpluginTest_JBIDE8792->Nullplugin_JBIDE8792
Copied: branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/NullpluginTest_JBIDE8792.java (from rev 31875, branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java)
===================================================================
--- branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/NullpluginTest_JBIDE8792.java (rev 0)
+++ branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/NullpluginTest_JBIDE8792.java 2011-06-07 11:30:31 UTC (rev 31876)
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.xulrunner.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.vpe.xulrunner.browser.XulRunnerBrowser;
+import org.osgi.framework.Bundle;
+
+/**
+ * Check that there is no nullplugin in the XULRunner bundle.
+ * <p>
+ * The nullplugin is the default plug-in for Adobe Flash. The
+ * presence of it is undesirable for VPE, because it shows annoying
+ * message suggesting to download Adobe Flash plugin.
+ *
+ * @see <a href="https://issues.jboss.org/browse/JBIDE-8792">JBIDE-8792</a>
+ * @author Yahor Radtsevich
+ */
+public class NullpluginTest_JBIDE8792 extends TestCase {
+ public void testNullplugin() {
+ Bundle xulRunnerBundle = Platform.getBundle(XulRunnerBrowser.getXulRunnerBundle());
+ assertTrue("Nullplugin is found, but it should not be there.",
+ xulRunnerBundle.getResource("xulrunner/plugins/libnullplugin.so") == null &&
+ xulRunnerBundle.getResource("xulrunner/plugins/npnul32.dll") == null);
+ }
+}
Deleted: branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java
===================================================================
--- branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java 2011-06-07 11:28:47 UTC (rev 31875)
+++ branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java 2011-06-07 11:30:31 UTC (rev 31876)
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.vpe.xulrunner.test;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.vpe.xulrunner.browser.XulRunnerBrowser;
-import org.osgi.framework.Bundle;
-
-/**
- * Check that there is no nullplugin in the XULRunner bundle.
- * <p>
- * The nullplugin is the default plug-in for Adobe Flash. The
- * presence of it is undesirable for VPE, because it shows annoying
- * message suggesting to download Adobe Flash plugin.
- *
- * @see <a href="https://issues.jboss.org/browse/JBIDE-8792">JBIDE-8792</a>
- * @author Yahor Radtsevich
- */
-public class Nullplugin_JBIDE8792 extends TestCase {
- public void testNullplugin() {
- Bundle xulRunnerBundle = Platform.getBundle(XulRunnerBrowser.getXulRunnerBundle());
- assertTrue("Nullplugin is found, but it should not be there.",
- xulRunnerBundle.getResource("xulrunner/plugins/libnullplugin.so") == null &&
- xulRunnerBundle.getResource("xulrunner/plugins/npnul32.dll") == null);
- }
-}
Modified: branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java
===================================================================
--- branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java 2011-06-07 11:28:47 UTC (rev 31875)
+++ branches/jbosstools-3.2.x/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java 2011-06-07 11:30:31 UTC (rev 31876)
@@ -19,7 +19,7 @@
suite.addTestSuite(XulRunnerBrowserTest.class);
suite.addTestSuite(DOMCreatingTest.class);
suite.addTestSuite(XPCOMTest.class);
- suite.addTestSuite(Nullplugin_JBIDE8792.class);
+ suite.addTestSuite(NullpluginTest_JBIDE8792.class);
return suite;
}
}
14 years, 10 months
JBoss Tools SVN: r31875 - trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-06-07 07:28:47 -0400 (Tue, 07 Jun 2011)
New Revision: 31875
Added:
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/NullpluginTest_JBIDE8792.java
Removed:
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-8792 : Install flash plugin message appears in VPE if on page used flash references
- minor fix, class renamed: NullpluginTest_JBIDE8792->Nullplugin_JBIDE8792
Copied: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/NullpluginTest_JBIDE8792.java (from rev 31826, trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java)
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/NullpluginTest_JBIDE8792.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/NullpluginTest_JBIDE8792.java 2011-06-07 11:28:47 UTC (rev 31875)
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.xulrunner.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.Platform;
+import org.jboss.tools.vpe.xulrunner.browser.XulRunnerBrowser;
+import org.osgi.framework.Bundle;
+
+/**
+ * Check that there is no nullplugin in the XULRunner bundle.
+ * <p>
+ * The nullplugin is the default plug-in for Adobe Flash. The
+ * presence of it is undesirable for VPE, because it shows annoying
+ * message suggesting to download Adobe Flash plugin.
+ *
+ * @see <a href="https://issues.jboss.org/browse/JBIDE-8792">JBIDE-8792</a>
+ * @author Yahor Radtsevich
+ */
+public class NullpluginTest_JBIDE8792 extends TestCase {
+ public void testNullplugin() {
+ Bundle xulRunnerBundle = Platform.getBundle(XulRunnerBrowser.getXulRunnerBundle());
+ assertTrue("Nullplugin is found, but it should not be there.",
+ xulRunnerBundle.getResource("xulrunner/plugins/libnullplugin.so") == null &&
+ xulRunnerBundle.getResource("xulrunner/plugins/npnul32.dll") == null);
+ }
+}
Deleted: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java 2011-06-07 09:09:02 UTC (rev 31874)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/Nullplugin_JBIDE8792.java 2011-06-07 11:28:47 UTC (rev 31875)
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.vpe.xulrunner.test;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.jboss.tools.vpe.xulrunner.browser.XulRunnerBrowser;
-import org.osgi.framework.Bundle;
-
-/**
- * Check that there is no nullplugin in the XULRunner bundle.
- * <p>
- * The nullplugin is the default plug-in for Adobe Flash. The
- * presence of it is undesirable for VPE, because it shows annoying
- * message suggesting to download Adobe Flash plugin.
- *
- * @see <a href="https://issues.jboss.org/browse/JBIDE-8792">JBIDE-8792</a>
- * @author Yahor Radtsevich
- */
-public class Nullplugin_JBIDE8792 extends TestCase {
- public void testNullplugin() {
- Bundle xulRunnerBundle = Platform.getBundle(XulRunnerBrowser.getXulRunnerBundle());
- assertTrue("Nullplugin is found, but it should not be there.",
- xulRunnerBundle.getResource("xulrunner/plugins/libnullplugin.so") == null &&
- xulRunnerBundle.getResource("xulrunner/plugins/npnul32.dll") == null);
- }
-}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java 2011-06-07 09:09:02 UTC (rev 31874)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test/XulRunnerAllTests.java 2011-06-07 11:28:47 UTC (rev 31875)
@@ -19,7 +19,7 @@
suite.addTestSuite(XulRunnerBrowserTest.class);
suite.addTestSuite(DOMCreatingTest.class);
suite.addTestSuite(XPCOMTest.class);
- suite.addTestSuite(Nullplugin_JBIDE8792.class);
+ suite.addTestSuite(NullpluginTest_JBIDE8792.class);
return suite;
}
}
14 years, 10 months
JBoss Tools SVN: r31874 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-07 05:09:02 -0400 (Tue, 07 Jun 2011)
New Revision: 31874
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
Log:
JBIDE-8961 - improving tmp deploy situation for as7
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-06-07 08:42:37 UTC (rev 31873)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7Server.java 2011-06-07 09:09:02 UTC (rev 31874)
@@ -50,11 +50,8 @@
// Just force it to be in metadata location, for now
public String getTempDeployFolder() {
- IPath p = JBossServerCorePlugin.getServerStateLocation(getServer()).
- append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute();
- if( !p.toFile().exists()) {
- p.toFile().mkdirs();
- }
- return p.toString();
+ IRuntime rt = getServer().getRuntime();
+ IPath p = rt.getLocation().append(AS7_STANDALONE).append(FOLDER_TMP);
+ return ServerUtil.makeGlobal(rt, p).toString();
}
}
14 years, 10 months
JBoss Tools SVN: r31873 - branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-07 04:42:37 -0400 (Tue, 07 Jun 2011)
New Revision: 31873
Modified:
branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
Log:
as.ui compilation failure in branch, not seeing an error in branch, but jenkins sees error
Modified: branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
===================================================================
--- branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2011-06-07 08:11:13 UTC (rev 31872)
+++ branches/jbosstools-3.2.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2011-06-07 08:42:37 UTC (rev 31873)
@@ -46,7 +46,6 @@
import org.eclipse.wst.server.core.model.ServerDelegate;
import org.eclipse.wst.server.ui.internal.Messages;
import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
-import org.eclipse.wst.server.ui.internal.Trace;
import org.eclipse.wst.server.ui.internal.actions.NewServerWizardAction;
import org.eclipse.wst.server.ui.internal.view.servers.CopyAction;
import org.eclipse.wst.server.ui.internal.view.servers.DeleteAction;
@@ -125,7 +124,7 @@
IServer server = (IServer) data;
ServerUIPlugin.editServer(server);
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, org.jboss.ide.eclipse.as.ui.Messages.ServerActionProvider_CouldNotOpenServerError, e);
+ //Trace.trace(Trace.SEVERE, org.jboss.ide.eclipse.as.ui.Messages.ServerActionProvider_CouldNotOpenServerError, e);
}
}
});
14 years, 10 months