JBoss Tools SVN: r44008 - trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-09-25 11:57:07 -0400 (Tue, 25 Sep 2012)
New Revision: 44008
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java
Log:
JBIDE-12716 - Remove button does not work properly
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 2012-09-25 15:51:56 UTC (rev 44007)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/preferences/RuntimePreferencePage.java 2012-09-25 15:57:07 UTC (rev 44008)
@@ -396,9 +396,13 @@
RuntimeUIActivator.launchSearchRuntimePathDialog(getShell(),
new RuntimePath[]{runtimePath}, true, 15);
configureSearch();
- RuntimeUIActivator.getDefault().getModel().addRuntimePath(runtimePath);
- runtimePaths = RuntimeUIActivator.getRuntimePaths();
- runtimePathViewer.setInput(runtimePath.getRuntimeDefinitions());
+ //RuntimeUIActivator.getDefault().getModel().addRuntimePath(runtimePath);
+ //runtimePaths = RuntimeUIActivator.getRuntimePaths();
+ //runtimePathViewer.setInput(runtimePath.getRuntimeDefinitions());
+ RuntimePath[] newRuntimePaths = new RuntimePath[runtimePaths.length+1];
+ System.arraycopy(runtimePaths, 0, newRuntimePaths, 0, runtimePaths.length);
+ newRuntimePaths[runtimePaths.length] = runtimePath;
+ runtimePaths = newRuntimePaths;
runtimePathViewer.refresh();
}
@@ -409,9 +413,14 @@
IStructuredSelection selection = (IStructuredSelection) sel;
Object object = selection.getFirstElement();
if (object instanceof RuntimePath) {
+ RuntimePath[] newRuntimePaths = new RuntimePath[runtimePaths.length-1];
ArrayList<RuntimePath> l = new ArrayList<RuntimePath>(Arrays.asList(runtimePaths));
l.remove(object);
- runtimePaths = (RuntimePath[]) l.toArray(new RuntimePath[l.size()]);
+ int i = 0;
+ for (RuntimePath path:l) {
+ newRuntimePaths[i++] = path;
+ }
+ runtimePaths = newRuntimePaths;
configureSearch();
runtimePathViewer.refresh();
}
13 years, 6 months
JBoss Tools SVN: r44007 - trunk/tests/scripts/installation-updates/src/main/groovy.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-09-25 11:51:56 -0400 (Tue, 25 Sep 2012)
New Revision: 44007
Modified:
trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy
Log:
JBIDE-12717: Propagate errors
Modified: trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy
===================================================================
--- trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy 2012-09-25 15:31:53 UTC (rev 44006)
+++ trunk/tests/scripts/installation-updates/src/main/groovy/testInstall.groovy 2012-09-25 15:51:56 UTC (rev 44007)
@@ -56,13 +56,17 @@
"-consoleLog -debug");
proc.init();
int returnCode = proc.executeJava();
+ if (returnCode != 0) {
+ println("An error occured. Most probably because of wrong configuration of environment.");
+ System.exit(1);
+ }
output.eachLine { line ->
if (line.contains("Failures:")) {
if (line.contains("Failures: 0, Errors: 0")) {
return;
} else {
- println("Error while installing. Read " + report + " for details and see screenshots/")
+ println("Failed to install. Read " + report + " for details and see screenshots/")
}
}
}
13 years, 6 months
JBoss Tools SVN: r44006 - in trunk/maven/plugins: org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-09-25 11:31:53 -0400 (Tue, 25 Sep 2012)
New Revision: 44006
Removed:
trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/profiles/
Modified:
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/META-INF/MANIFEST.MF
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java
trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF
Log:
JBIDE-12530 Warn the user about unresolvable dependencies during maven conversion and add a link to Repository Management.
Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/META-INF/MANIFEST.MF 2012-09-25 15:29:38 UTC (rev 44005)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/META-INF/MANIFEST.MF 2012-09-25 15:31:53 UTC (rev 44006)
@@ -13,7 +13,8 @@
org.eclipse.jst.j2ee.ui;bundle-version="1.1.500",
org.eclipse.ui.ide;bundle-version="3.7.0",
org.eclipse.m2e.core.ui;bundle-version="1.1.0",
- org.jboss.tools.maven.core;bundle-version="1.4.0"
+ org.jboss.tools.maven.core;bundle-version="1.4.0",
+ org.jboss.tools.maven.ui;bundle-version="1.4.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %BundleVendor
Bundle-Localization: plugin
Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java 2012-09-25 15:29:38 UTC (rev 44005)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java 2012-09-25 15:31:53 UTC (rev 44006)
@@ -32,6 +32,9 @@
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTableViewer;
@@ -39,6 +42,7 @@
import org.eclipse.jface.viewers.ICheckStateListener;
import org.eclipse.jface.viewers.TableViewerColumn;
import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -51,6 +55,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
@@ -68,6 +73,7 @@
import org.jboss.tools.maven.core.identification.IFileIdentificationManager;
import org.jboss.tools.maven.core.identification.IdentificationUtil;
import org.jboss.tools.maven.core.internal.identification.FileIdentificationManager;
+import org.jboss.tools.maven.ui.wizard.ConfigureMavenRepositoriesWizard;
public class IdentifyMavenDependencyPage extends WizardPage {
@@ -106,6 +112,10 @@
private Button stopButton;
+ private Label warningImg;
+
+ private Link warningLink;
+
private static String MESSAGE = "Identify existing classpath entries as Maven dependencies. Double-click on a Maven Dependency to edit its details";
@@ -159,6 +169,31 @@
loadingImage = MavenDependencyConversionActivator.getLoadingIcon();
}
+ private void createWarning(Composite container) {
+ warningImg = new Label(container, SWT.CENTER);
+ warningLink = new Link(container, SWT.NONE);
+ warningLink.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 2, 1));
+ GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(warningImg);
+ warningImg.setImage(JFaceResources.getImage(Dialog.DLG_IMG_MESSAGE_WARNING));
+ warningLink.setText("Some selected dependencies can not be resolved. Click <a>here</a> to configure repositories in your settings.xml.");
+ warningLink.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ openSettingsRepositoriesWizard();
+ }
+
+ private void openSettingsRepositoriesWizard() {
+ ConfigureMavenRepositoriesWizard wizard = new ConfigureMavenRepositoriesWizard();
+ WizardDialog dialog = new WizardDialog(Display.getDefault().getActiveShell(), wizard);
+ dialog.create();
+ dialog.open();
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ widgetSelected(e);
+ }
+ });
+ }
+
@Override
public void createControl(Composite parent) {
@@ -177,6 +212,8 @@
setMessage(MESSAGE);
+ createWarning(container);
+
displayDependenciesTable(container);
Link remoteRepoPrefsLink = new Link(container, SWT.NONE);
@@ -422,10 +459,24 @@
private synchronized void refresh() {
enableIdentificationButtons();
+ displayWarning();
setPageComplete(hasNoRunningJobs());
//setMessage(MESSAGE);
}
+ private void displayWarning() {
+ for (Dependency d : getDependencies()) {
+ if (Boolean.FALSE.equals(dependencyResolution.get(d))) {
+ setVisible(warningImg, true);
+ setVisible(warningLink, true);
+ return;
+ }
+ }
+ setVisible(warningImg, false);
+ setVisible(warningLink, false);
+
+ }
+
private void setVisible(Control control, boolean visible) {
if (control != null && !control.isDisposed()) {
control.setVisible(visible);
@@ -561,6 +612,7 @@
}
}
} finally {
+ displayWarning();
enableIdentificationButtons();
}
}
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF 2012-09-25 15:29:38 UTC (rev 44005)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF 2012-09-25 15:31:53 UTC (rev 44006)
@@ -26,4 +26,5 @@
Export-Package: org.jboss.tools.maven.ui,
org.jboss.tools.maven.ui.internal.libprov,
org.jboss.tools.maven.ui.internal.project.facet,
- org.jboss.tools.maven.ui.preferences
+ org.jboss.tools.maven.ui.preferences,
+ org.jboss.tools.maven.ui.wizard
13 years, 6 months
JBoss Tools SVN: r44005 - trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-09-25 11:29:38 -0400 (Tue, 25 Sep 2012)
New Revision: 44005
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java
Log:
JBIDE-12714 - When two servers with same version are found only one is added
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 2012-09-25 15:28:57 UTC (rev 44004)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2012-09-25 15:29:38 UTC (rev 44005)
@@ -10,6 +10,7 @@
************************************************************************************/
package org.jboss.tools.runtime.ui.dialogs;
+import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
@@ -352,22 +353,19 @@
boolean hideCreatedRuntimes) {
ArrayList<RuntimeDefinition> runtimeDefinitions = new ArrayList<RuntimeDefinition>();
- // It seems the intent of this block is to increment a name on a runtime definition,
- // however, the model it's pulling a runtime definition from the list of all definitions.
- // IF the items are ==, they will continue to be == even after a name change ?!
-// List<RuntimeDefinition> allDefinitions = getAllDefinitions();
-// for (RuntimePath runtimePath : runtimePaths) {
-// List<RuntimeDefinition> pathDefinitions = getAllDefinitions(runtimePath);
-// for (RuntimeDefinition runtimeDefinition : pathDefinitions) {
-// if (!RuntimeUIActivator.runtimeCreated(runtimeDefinition)) {
-// String name = runtimeDefinition.getName();
-// int i = 2;
-// while (runtimeDefinitionsExists(runtimeDefinition, allDefinitions)) {
-// runtimeDefinition.setName(name + " (" + i++ + ")");
-// }
-// }
-// }
-// }
+ List<RuntimeDefinition> allDefinitions = getAllDefinitions();
+ for (RuntimePath runtimePath : runtimePaths) {
+ List<RuntimeDefinition> pathDefinitions = getAllDefinitions(runtimePath);
+ for (RuntimeDefinition runtimeDefinition : pathDefinitions) {
+ if (!RuntimeUIActivator.runtimeCreated(runtimeDefinition)) {
+ String name = runtimeDefinition.getName();
+ int i = 2;
+ while (runtimeDefinitionExists(runtimeDefinition, allDefinitions)) {
+ runtimeDefinition.setName(name + " (" + i++ + ")");
+ }
+ }
+ }
+ }
for (RuntimePath runtimePath : runtimePaths) {
for (RuntimeDefinition runtimeDefinition : runtimePath.getRuntimeDefinitions()) {
@@ -389,8 +387,34 @@
return RuntimeModelUtil.getAllDefinitions(RuntimeUIActivator.getRuntimePaths());
}
- private boolean runtimeDefinitionsExists(RuntimeDefinition runtimeDefinition,List<RuntimeDefinition> allRuntimeDefinitions) {
- return RuntimeModelUtil.runtimeDefinitionsExists(runtimeDefinition, allRuntimeDefinitions);
+ private boolean runtimeDefinitionExists(RuntimeDefinition runtimeDefinition,
+ List<RuntimeDefinition> allRuntimeDefinitions) {
+ String name = runtimeDefinition.getName();
+ File location = runtimeDefinition.getLocation();
+ String type = runtimeDefinition.getType();
+ if (name == null || location == null || type == null) {
+ return false;
+ }
+ String path = location.getAbsolutePath();
+ if (path == null) {
+ return false;
+ }
+ for (RuntimeDefinition definition:allRuntimeDefinitions) {
+ if (name.equals(definition.getName()) && type.equals(definition.getType())) {
+ File loc = definition.getLocation();
+ if (loc == null) {
+ continue;
+ }
+ String dPath = loc.getAbsolutePath();
+ if (dPath == null) {
+ continue;
+ }
+ if (!path.equals(dPath)) {
+ return true;
+ }
+ }
+ }
+ return false;
}
}
13 years, 6 months
JBoss Tools SVN: r44004 - trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-09-25 11:28:57 -0400 (Tue, 25 Sep 2012)
New Revision: 44004
Modified:
trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java
Log:
JBIDE-12551 : replaced Reset Button by stop/start identification buttons.
Modified: trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java 2012-09-25 15:04:01 UTC (rev 44003)
+++ trunk/maven/plugins/org.jboss.tools.maven.conversion.ui/src/org/jboss/tools/maven/conversion/ui/dialog/IdentifyMavenDependencyPage.java 2012-09-25 15:28:57 UTC (rev 44004)
@@ -49,19 +49,22 @@
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.ui.dialogs.PreferencesUtil;
import org.jboss.tools.maven.conversion.ui.dialog.xpl.ConversionUtils;
import org.jboss.tools.maven.conversion.ui.dialog.xpl.EditDependencyDialog;
import org.jboss.tools.maven.conversion.ui.internal.CellListener;
import org.jboss.tools.maven.conversion.ui.internal.MavenDependencyConversionActivator;
import org.jboss.tools.maven.conversion.ui.internal.jobs.DependencyResolutionJob;
import org.jboss.tools.maven.conversion.ui.internal.jobs.IdentificationJob;
+import org.jboss.tools.maven.conversion.ui.internal.jobs.IdentificationJob.Task;
import org.jboss.tools.maven.conversion.ui.internal.jobs.IdentifyJarJob;
import org.jboss.tools.maven.conversion.ui.internal.jobs.IdentifyProjectJob;
-import org.jboss.tools.maven.conversion.ui.internal.jobs.IdentificationJob.Task;
import org.jboss.tools.maven.core.identification.IFileIdentificationManager;
import org.jboss.tools.maven.core.identification.IdentificationUtil;
import org.jboss.tools.maven.core.internal.identification.FileIdentificationManager;
@@ -99,6 +102,10 @@
private boolean deleteJars;
+ private Button startIdentification;
+
+ private Button stopButton;
+
private static String MESSAGE = "Identify existing classpath entries as Maven dependencies. Double-click on a Maven Dependency to edit its details";
@@ -172,6 +179,20 @@
displayDependenciesTable(container);
+ Link remoteRepoPrefsLink = new Link(container, SWT.NONE);
+ remoteRepoPrefsLink.setText("Manage <a>remote repositories</a> used to identify dependencies.");
+ GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1);
+ remoteRepoPrefsLink.setLayoutData(gd);
+ remoteRepoPrefsLink.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ openRemoteRepoPrefs();
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ widgetSelected(e);
+ }
+ });
+
deleteJarsBtn = addCheckButton(container, "Delete classpath entries from project", deleteJars);
deleteJarsBtn.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
@@ -190,8 +211,14 @@
checkBtn.setSelection(selected);
return checkBtn;
}
-
+
+ private void openRemoteRepoPrefs() {
+ String id = "org.jboss.tools.maven.ui.preferences.RemoteRepositoriesPreferencePage";
+ PreferencesUtil.createPreferenceDialogOn(getShell(), id, new String[] {id}, null).open();
+ }
+
private void displayDependenciesTable(Composite container) {
+
GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 4);
gd.heightHint = 500;
gd.widthHint = 545;
@@ -295,11 +322,8 @@
addSelectionButton(container, "Select All", true);
addSelectionButton(container, "Deselect All", false);
- if (Boolean.getBoolean("org.jboss.tools.maven.conversion.debug")) {
- addIdentifyButton(container, "Identify dependencies");
- addResetButton(container, "Reset");
- }
-
+ addIdentifyButton(container, "Identify dependencies");
+ addStopButton(container, "Stop identification");
}
@@ -314,7 +338,7 @@
public boolean hasNoRunningJobs() {
for (IdentificationJob job : identificationJobs.values()) {
- if (job.getState() == Job.RUNNING){
+ if (job.getState() == Job.RUNNING || job.getState() == Job.WAITING){
return false;
}
}
@@ -340,42 +364,36 @@
return button;
}
- private Button addResetButton(Composite container, String label) {
- Button button = new Button(container, SWT.NONE);
- button.setLayoutData(new GridData(SWT.FILL, SWT.UP, false, false, 1, 1));
- button.setText(label);
- button.addSelectionListener(new SelectionListener() {
+ private void addStopButton(Composite container, String label) {
+ stopButton = new Button(container, SWT.NONE);
+ stopButton.setLayoutData(new GridData(SWT.FILL, SWT.UP, false, false, 1, 1));
+ stopButton.setText(label);
+ stopButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- initDependencyMap( );
- dependenciesViewer.setInput(dependencyMap.keySet());
- dependenciesViewer.setAllChecked(true);
+ cancel();
refresh();
}
public void widgetDefaultSelected(SelectionEvent e) {
-
+ widgetSelected(e);
}
});
-
- return button;
}
- private Button addIdentifyButton(Composite container, String label) {
- Button button = new Button(container, SWT.NONE);
- button.setLayoutData(new GridData(SWT.FILL, SWT.UP, false, false, 1, 1));
- button.setText(label);
- button.addSelectionListener(new SelectionListener() {
+ private void addIdentifyButton(Composite container, String label) {
+ startIdentification = new Button(container, SWT.NONE);
+ startIdentification.setLayoutData(new GridData(SWT.FILL, SWT.UP, false, false, 1, 1));
+ startIdentification.setText(label);
+ startIdentification.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
runIdentificationJobs(null);
}
public void widgetDefaultSelected(SelectionEvent e) {
-
+ widgetSelected(e);
}
});
-
- return button;
}
protected void runIdentificationJobs(IProgressMonitor monitor) {
@@ -399,21 +417,33 @@
}
}
}
+ refresh();
}
private synchronized void refresh() {
+ enableIdentificationButtons();
+ setPageComplete(hasNoRunningJobs());
+ //setMessage(MESSAGE);
+ }
+
+ private void setVisible(Control control, boolean visible) {
+ if (control != null && !control.isDisposed()) {
+ control.setVisible(visible);
+ }
+ }
+
+ private void enableIdentificationButtons() {
+ boolean hasNoRunningJobs = hasNoRunningJobs();
+ if (startIdentification != null && !startIdentification.isDisposed()) {
+ startIdentification.setEnabled(hasNoRunningJobs);
+ }
+ if (stopButton != null && !stopButton.isDisposed()) {
+ stopButton.setEnabled(!hasNoRunningJobs);
+ }
+
if (dependenciesViewer != null && !dependenciesViewer.getTable().isDisposed()) {
dependenciesViewer.refresh();
}
-
- for (Dependency d : getDependencies()) {
- if (Boolean.FALSE.equals(dependencyResolution.get(d))) {
- setMessage("Some selected dependencies can not be resolved using the repositories from your settings.xml", WARNING);
- return;
- }
- }
- setPageComplete(hasNoRunningJobs());
- setMessage(MESSAGE);
}
private static String toString(Dependency d) {
@@ -513,21 +543,25 @@
return;
}
//dependenciesViewer.refresh();
- for (TableItem item : dependenciesViewer.getTable().getItems()) {
- @SuppressWarnings("unchecked")
- final IClasspathEntry cpe = (IClasspathEntry)item.getData();
- if (cpe.equals(key)) {
- dependenciesViewer.refresh(cpe, false);
- //Don't force check when there's an existing dependency, only uncheck if they're is not.
- if (dependencyMap.get(cpe) == null) {
- Job job = identificationJobs.get(cpe);
- if (job != null && job.getState() == Job.NONE) {
- dependenciesViewer.setChecked(cpe, false);
+ try {
+ for (TableItem item : dependenciesViewer.getTable().getItems()) {
+ @SuppressWarnings("unchecked")
+ final IClasspathEntry cpe = (IClasspathEntry)item.getData();
+ if (cpe.equals(key)) {
+ dependenciesViewer.refresh(cpe, false);
+ //Don't force check when there's an existing dependency, only uncheck if they're is not.
+ if (dependencyMap.get(cpe) == null) {
+ Job job = identificationJobs.get(cpe);
+ if (job != null && job.getState() == Job.NONE) {
+ dependenciesViewer.setChecked(cpe, false);
+ }
}
+ setPageComplete(hasNoRunningJobs());
+ return;
}
- setPageComplete(hasNoRunningJobs());
- return;
}
+ } finally {
+ enableIdentificationButtons();
}
}
13 years, 6 months
JBoss Tools SVN: r44003 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-09-25 11:04:01 -0400 (Tue, 25 Sep 2012)
New Revision: 44003
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/StableTestsSuite.java
Log:
Reverted back, tests are not ready
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/StableTestsSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/StableTestsSuite.java 2012-09-25 14:46:19 UTC (rev 44002)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/StableTestsSuite.java 2012-09-25 15:04:01 UTC (rev 44003)
@@ -6,12 +6,6 @@
import org.jboss.tools.portlet.ui.bot.test.core.HotJavaPortletDeploymentGatein;
import org.jboss.tools.portlet.ui.bot.test.core.LoadJavaPortletInBrowserJBPortal;
import org.jboss.tools.portlet.ui.bot.test.core.RunJavaPortletOnServer;
-import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletGatein;
-import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletJBPortal;
-import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject;
-import org.jboss.tools.portlet.ui.bot.test.jsf.HotJSFPortletDeploymentGatein;
-import org.jboss.tools.portlet.ui.bot.test.jsf.LoadJSFPortletInBrowserJBPortal;
-import org.jboss.tools.portlet.ui.bot.test.jsf.RunJSFPortletOnServer;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -24,13 +18,7 @@
RunJavaPortletOnServer.class,
LoadJavaPortletInBrowserJBPortal.class,
HotJavaPortletDeploymentGatein.class,
- CreateJSFPortletProject.class,
- CreateJSFPortletJBPortal.class,
- CreateJSFPortletGatein.class,
- RunJSFPortletOnServer.class,
- LoadJSFPortletInBrowserJBPortal.class,
- HotJSFPortletDeploymentGatein.class
- })
+})
public class StableTestsSuite {
}
13 years, 6 months
JBoss Tools SVN: r44002 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-09-25 10:46:19 -0400 (Tue, 25 Sep 2012)
New Revision: 44002
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
Log:
Added Archive support menu label
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-09-25 14:44:55 UTC (rev 44001)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-09-25 14:46:19 UTC (rev 44002)
@@ -61,6 +61,8 @@
public static final String JBT_REMOVE_STRUTS_CAPABILITIES = "Remove Struts Capabilities";
public static final String ADD_STRUTS_CAPABILITIES = "Add Struts Capabilities...";
public static final String WEB_PROJECT_JBT_STRUTS = "JBoss Tools Struts";
+ public static final String ADD_ARCHIVE_SUPPORT = "Add Project Archives Support";
+ public static final String REMOVE_ARCHIVE_SUPPORT = "Remove Project Archives Support";
public static final String RUN = "Run";
public static final String RUN_ON_SERVER = "Run on Server";
public static final String RESUME = "Resume";
13 years, 6 months
JBoss Tools SVN: r44001 - trunk/tests/scripts/installation-updates/src/main/groovy.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-09-25 10:44:55 -0400 (Tue, 25 Sep 2012)
New Revision: 44001
Modified:
trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy
Log:
Clean previous install
Modified: trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy
===================================================================
--- trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy 2012-09-25 14:42:50 UTC (rev 44000)
+++ trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy 2012-09-25 14:44:55 UTC (rev 44001)
@@ -6,6 +6,10 @@
String releaseTrainId = System.properties['releaseTrainId'] != null ? System.properties['releaseTrainId'] : "juno";
String versionLabel = System.properties['versionLabel'] != null ? System.properties['versionLabel'] : "R";
+if (new File("eclipse").isDirectory()) {
+ new AntBuilder().delete( dir: new File("eclipse").getAbsolutePath() );
+}
+
String osLabel = System.properties['os.name'].toLowerCase();
String fileExtension = null;
if (osLabel.contains("windows")) {
13 years, 6 months
JBoss Tools SVN: r44000 - trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-09-25 10:42:50 -0400 (Tue, 25 Sep 2012)
New Revision: 44000
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java
Log:
JBIDE-12710 - Exception is thrown when creating blank Java EE Web Project
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java 2012-09-25 14:34:57 UTC (rev 43999)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsMetamodelValidator.java 2012-09-25 14:42:50 UTC (rev 44000)
@@ -103,7 +103,7 @@
try {
if (!changedFiles.isEmpty()) {
final JaxrsMetamodel jaxrsMetamodel = JaxrsMetamodelLocator.get(project);
- final Set<IResource> allResources = completeValidationSet(jaxrsMetamodel, (IResource[]) changedFiles.toArray());
+ final Set<IResource> allResources = completeValidationSet(jaxrsMetamodel, (IResource[]) changedFiles.toArray(new IResource[0]));
for (IResource changedResource : allResources) {
validate(reporter, changedResource, jaxrsMetamodel);
}
13 years, 6 months
JBoss Tools SVN: r43999 - trunk/tests/scripts/installation-updates/src/main/groovy.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-09-25 10:34:57 -0400 (Tue, 25 Sep 2012)
New Revision: 43999
Added:
trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy
Log:
Multi-platfrom getEclipse script
Added: trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy
===================================================================
--- trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy (rev 0)
+++ trunk/tests/scripts/installation-updates/src/main/groovy/getAndInstallEclipse.groovy 2012-09-25 14:34:57 UTC (rev 43999)
@@ -0,0 +1,45 @@
+import groovy.util.AntBuilder
+import org.apache.tools.ant.taskdefs.Get;
+
+File eclipseCacheDirectory = System.properties['eclipseCacheDirectory'] != null ? new File(System.properties['eclipseCacheDirectory']) : new File(".");
+String eclipseFlavour = System.properties['eclipseFlavour'] != null ? System.properties['eclipseFlavour'] : "jee";
+String releaseTrainId = System.properties['releaseTrainId'] != null ? System.properties['releaseTrainId'] : "juno";
+String versionLabel = System.properties['versionLabel'] != null ? System.properties['versionLabel'] : "R";
+
+String osLabel = System.properties['os.name'].toLowerCase();
+String fileExtension = null;
+if (osLabel.contains("windows")) {
+ osLabel = "win32";
+ fileExtension = "zip";
+} else if (osLabel.contains("linux")) {
+ osLabel = "linux-gtk";
+ fileExtension = "tar.gz";
+} else if (osLabel.contains("mac")) {
+ osLabel = "macosx-cocoa";
+ fileExtension = "tar.gz";
+}
+String archLabel = System.properties['os.arch'].contains("64") ? "-x86_64" : "";
+
+String eclipseArchive = "eclipse-" + eclipseFlavour + "-" + releaseTrainId + "-" + osLabel + archLabel + "." + fileExtension;
+String downloadURL = "http://www.eclipse.org/downloads/download.php?r=1&file=/technology/epp/do..." + releaseTrainId + "/" + versionLabel +"/" + eclipseArchive;
+println("Will retrieve " + eclipseArchive)
+
+File cachedFile = new File(eclipseCacheDirectory, eclipseArchive);
+if (!cachedFile.isFile()) {
+ new AntBuilder().get(
+ src: downloadURL,
+ dest: cachedFile);
+ if (fileExtension.equals("tar.gz")) {
+ new AntBuilder().gunzip(src: cachedFile.getAbsolutePath());
+ }
+}
+// Unzip
+if (fileExtension.equals("zip")) {
+ new AntBuilder().unzip(
+ src: cachedFile.getAbsolutePath(),
+ dest: new File().getAbsolutePath());
+} else if (fileExtension.equals("tar.gz")) {
+ new AntBuilder().untar(
+ src: cachedFile.getAbsolutePath()[0..- (".gz".length() + 1)],
+ dest: new File(".").getAbsolutePath());
+}
\ No newline at end of file
13 years, 6 months