JBoss Tools SVN: r42814 - in trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test: .settings and 9 other directories.
by jbosstools-commits@lists.jboss.org
Author: jpeterka
Date: 2012-07-31 11:00:03 -0400 (Tue, 31 Jul 2012)
New Revision: 42814
Added:
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.classpath
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.project
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.settings/
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.settings/org.eclipse.jdt.core.prefs
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/META-INF/
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/META-INF/MANIFEST.MF
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/build.properties
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/org.jboss.tools.dummy.ui.bot.testa/
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/Activator.java
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummySuite.java
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummyTest.java
Log:
org.jboss.tools.dummy.ui.bot.test initial commit
Added: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.classpath
===================================================================
--- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.classpath (rev 0)
+++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.classpath 2012-07-31 15:00:03 UTC (rev 42814)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.project
===================================================================
--- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.project (rev 0)
+++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.project 2012-07-31 15:00:03 UTC (rev 42814)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.dummy.ui.bot.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.settings/org.eclipse.jdt.core.prefs 2012-07-31 15:00:03 UTC (rev 42814)
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/META-INF/MANIFEST.MF (rev 0)
+++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/META-INF/MANIFEST.MF 2012-07-31 15:00:03 UTC (rev 42814)
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test
+Bundle-SymbolicName: org.jboss.tools.dummy.ui.bot.test
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.jboss.tools.dummy.ui.bot.test.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.swtbot.go;bundle-version="2.0.5"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Property changes on: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/build.properties
===================================================================
--- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/build.properties (rev 0)
+++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/build.properties 2012-07-31 15:00:03 UTC (rev 42814)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Property changes on: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml
===================================================================
--- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml (rev 0)
+++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml 2012-07-31 15:00:03 UTC (rev 42814)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.tests</groupId>
+ <artifactId>tests</artifactId>
+ <version>3.4.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.jboss.tools.tests.tests</groupId>
+ <artifactId>org.jboss.tools.dummy.ui.bot.test</artifactId>
+
+ <packaging>eclipse-test-plugin</packaging>
+
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+</project>
\ No newline at end of file
Property changes on: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/Activator.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/Activator.java (rev 0)
+++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/Activator.java 2012-07-31 15:00:03 UTC (rev 42814)
@@ -0,0 +1,50 @@
+package org.jboss.tools.dummy.ui.bot.test;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.tools.dummy.ui.bot.test"; //$NON-NLS-1$
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
Property changes on: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/Activator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummySuite.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummySuite.java (rev 0)
+++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummySuite.java 2012-07-31 15:00:03 UTC (rev 42814)
@@ -0,0 +1,16 @@
+package org.jboss.tools.dummy.ui.bot.test;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * Dummy test suite is SWTBot test suite for basic jenkins slave test
+ * @author Jiri Peterka
+ *
+ */
+(a)RunWith(Suite.class)
+(a)SuiteClasses({DummyTest.class})
+public class DummySuite {
+
+}
Property changes on: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummySuite.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummyTest.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummyTest.java (rev 0)
+++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummyTest.java 2012-07-31 15:00:03 UTC (rev 42814)
@@ -0,0 +1,28 @@
+package org.jboss.tools.dummy.ui.bot.test;
+
+
+import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Dummy bot tests - designed to test jenkins slaves
+ * @author jpeterka
+ *
+ */
+(a)RunWith(SWTBotJunit4ClassRunner.class)
+public class DummyTest {
+
+ @BeforeClass
+ public static void before() {
+
+ }
+
+ @Test
+ public void dummyTest() {
+
+ }
+
+
+}
Property changes on: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/src/org/jboss/tools/dummy/ui/bot/test/DummyTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 2 months
JBoss Tools SVN: r42812 - trunk/central/tests/org.jboss.tools.central.test.ui.bot.
by jbosstools-commits@lists.jboss.org
Author: rhopp
Date: 2012-07-31 10:14:08 -0400 (Tue, 31 Jul 2012)
New Revision: 42812
Modified:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/.classpath
Log:
Fixed .classpath
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/.classpath
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/.classpath 2012-07-31 13:32:55 UTC (rev 42811)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/.classpath 2012-07-31 14:14:08 UTC (rev 42812)
@@ -3,7 +3,5 @@
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="/home/rhopp/jbdevstudio/studio/plugins/org.eclipse.ui.forms_3.5.100.v20110425.jar"/>
- <classpathentry kind="lib" path="/home/rhopp/jbdevstudio/studio/plugins/org.eclipse.swtbot.forms.finder_2.0.5.20111003_1754-3676ac8-dev-e36.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
13 years, 2 months
JBoss Tools SVN: r42811 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-07-31 09:32:55 -0400 (Tue, 31 Jul 2012)
New Revision: 42811
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
Log:
[JBIDE-12241] added decorator to repo path text field
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-07-31 13:32:44 UTC (rev 42810)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-07-31 13:32:55 UTC (rev 42811)
@@ -12,8 +12,6 @@
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeanProperties;
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.validation.MultiValidator;
import org.eclipse.core.databinding.validation.ValidationStatus;
@@ -23,6 +21,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.databinding.fieldassist.ControlDecorationSupport;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.dialogs.PageChangingEvent;
import org.eclipse.jface.layout.GridDataFactory;
@@ -130,9 +129,10 @@
GitCloningSettingsWizardPageModel.PROPERTY_APPLICATION_NAME).observe(pageModel);
final IObservableValue newProjectModelObservable = BeanProperties.value(
GitCloningSettingsWizardPageModel.PROPERTY_NEW_PROJECT).observe(pageModel);
-
- dbc.addValidationStatusProvider(new RepoPathValidationStatusProvider(repoPathObservable,
- applicationNameModelObservable, newProjectModelObservable));
+ RepoPathValidationStatusProvider repoPathValidator =
+ new RepoPathValidationStatusProvider(repoPathObservable, applicationNameModelObservable, newProjectModelObservable);
+ dbc.addValidationStatusProvider(repoPathValidator);
+ ControlDecorationSupport.create(repoPathValidator, SWT.LEFT | SWT.TOP);
// Remote Name Management
useDefaultRemoteNameButton = new Button(cloneGroup, SWT.CHECK);
13 years, 2 months
JBoss Tools SVN: r42810 - branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-07-31 09:32:44 -0400 (Tue, 31 Jul 2012)
New Revision: 42810
Modified:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
Log:
[JBIDE-12241] added decorator to repo path text field
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-07-31 13:03:26 UTC (rev 42809)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-07-31 13:32:44 UTC (rev 42810)
@@ -21,6 +21,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.databinding.fieldassist.ControlDecorationSupport;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.dialogs.PageChangingEvent;
import org.eclipse.jface.layout.GridDataFactory;
@@ -128,9 +129,11 @@
GitCloningSettingsWizardPageModel.PROPERTY_APPLICATION_NAME).observe(pageModel);
final IObservableValue newProjectModelObservable = BeanProperties.value(
GitCloningSettingsWizardPageModel.PROPERTY_NEW_PROJECT).observe(pageModel);
+ RepoPathValidationStatusProvider repoPathValidator =
+ new RepoPathValidationStatusProvider(repoPathObservable, applicationNameModelObservable, newProjectModelObservable);
+ dbc.addValidationStatusProvider(repoPathValidator);
+ ControlDecorationSupport.create(repoPathValidator, SWT.LEFT | SWT.TOP);
- dbc.addValidationStatusProvider(new RepoPathValidationStatusProvider(repoPathObservable,
- applicationNameModelObservable, newProjectModelObservable));
// Remote Name Management
useDefaultRemoteNameButton = new Button(cloneGroup, SWT.CHECK);
@@ -288,6 +291,8 @@
}
return ValidationStatus.ok();
}
+
+
}
13 years, 2 months
JBoss Tools SVN: r42809 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-07-31 09:03:26 -0400 (Tue, 31 Jul 2012)
New Revision: 42809
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CustomControlDecorationUpdater.java
Log:
added missing class header
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CustomControlDecorationUpdater.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CustomControlDecorationUpdater.java 2012-07-31 12:59:39 UTC (rev 42808)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CustomControlDecorationUpdater.java 2012-07-31 13:03:26 UTC (rev 42809)
@@ -1,6 +1,13 @@
-/**
+/*******************************************************************************
+ * Copyright (c) 2012 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
*
- */
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.wizard;
import org.eclipse.core.runtime.IStatus;
13 years, 2 months
JBoss Tools SVN: r42807 - branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-07-31 08:08:03 -0400 (Tue, 31 Jul 2012)
New Revision: 42807
Modified:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
Log:
[JBIDE-12386] implemented MultiValidator#getTargets to return application name only
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-07-31 12:07:54 UTC (rev 42806)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-07-31 12:08:03 UTC (rev 42807)
@@ -18,6 +18,8 @@
import org.eclipse.core.databinding.UpdateListStrategy;
import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.IValueChangeListener;
import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
@@ -775,7 +777,6 @@
return ValidationStatus.ok();
}
-
}
class NewApplicationNameValidator extends MultiValidator {
@@ -810,6 +811,13 @@
return ValidationStatus.ok();
}
+ @Override
+ public IObservableList getTargets() {
+ WritableList targets = new WritableList();
+ targets.add(applicationNameObservable);
+ return targets;
+ }
+
}
/**
13 years, 2 months
JBoss Tools SVN: r42806 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-07-31 08:07:54 -0400 (Tue, 31 Jul 2012)
New Revision: 42806
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
Log:
[JBIDE-12386] implemented MultiValidator#getTargets to return application name only
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-07-31 10:56:26 UTC (rev 42805)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-07-31 12:07:54 UTC (rev 42806)
@@ -18,6 +18,8 @@
import org.eclipse.core.databinding.UpdateListStrategy;
import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.conversion.Converter;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.IValueChangeListener;
import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
@@ -807,6 +809,14 @@
}
return ValidationStatus.ok();
}
+
+ @Override
+ public IObservableList getTargets() {
+ WritableList targets = new WritableList();
+ targets.add(applicationNameObservable);
+ return targets;
+ }
+
}
/**
13 years, 2 months
JBoss Tools SVN: r42805 - in branches/jbosstools-3.3.x/openshift: plugins/org.jboss.tools.openshift.egit.ui/META-INF and 5 other directories.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-07-31 06:56:26 -0400 (Tue, 31 Jul 2012)
New Revision: 42805
Modified:
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath
branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/EGitUtilsTest.java
branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/util/TestRepository.java
Log:
[JBIDE-12338] adapted version ranges in manifests, catched exception and rethrow RuntimeException/CoreException if EGit 2.0 throws additional exceptions
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java 2012-07-31 10:48:22 UTC (rev 42804)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.core/src/org/jboss/tools/openshift/egit/core/EGitUtils.java 2012-07-31 10:56:26 UTC (rev 42805)
@@ -47,7 +47,7 @@
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.InitCommand;
import org.eclipse.jgit.api.MergeResult;
-import org.eclipse.jgit.api.errors.JGitInternalException;
+import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.errors.NoWorkTreeException;
import org.eclipse.jgit.errors.NotSupportedException;
import org.eclipse.jgit.lib.ConfigConstants;
@@ -142,6 +142,7 @@
* @param monitor
* @return
* @throws CoreException
+ * @throws GitAPIException
*/
public static Repository share(IProject project, IProgressMonitor monitor) throws CoreException {
Repository repository = createRepository(project, monitor);
@@ -172,7 +173,9 @@
init.setBare(false).setDirectory(project.getLocation().toFile());
Git git = init.call();
return git.getRepository();
- } catch (JGitInternalException e) {
+ } catch (Exception e) {
+ // ugly workaround to allow us to use egit 2.0 while staying
+ // compatible
throw new CoreException(EGitCoreActivator.createErrorStatus(
NLS.bind("Could not initialize a git repository at {0}: {1}",
getRepositoryPathFor(project),
@@ -874,16 +877,29 @@
* @throws IOException
* @throws NoWorkTreeException
*/
- public static boolean isDirty(Repository repository) throws NoWorkTreeException, IOException {
- boolean hasChanges = false;
- org.eclipse.jgit.api.Status repoStatus = new Git(repository).status().call();
- hasChanges |= !repoStatus.getAdded().isEmpty();
- hasChanges |= !repoStatus.getChanged().isEmpty();
- hasChanges |= !repoStatus.getModified().isEmpty();
- hasChanges |= !repoStatus.getRemoved().isEmpty();
- hasChanges |= !repoStatus.getConflicting().isEmpty();
- hasChanges |= !repoStatus.getMissing().isEmpty();
- return hasChanges;
+ public static boolean isDirty(Repository repository)
+ throws NoWorkTreeException, IOException {
+ try {
+ boolean hasChanges = false;
+ org.eclipse.jgit.api.Status repoStatus = new Git(repository)
+ .status().call();
+ hasChanges |= !repoStatus.getAdded().isEmpty();
+ hasChanges |= !repoStatus.getChanged().isEmpty();
+ hasChanges |= !repoStatus.getModified().isEmpty();
+ hasChanges |= !repoStatus.getRemoved().isEmpty();
+ hasChanges |= !repoStatus.getConflicting().isEmpty();
+ hasChanges |= !repoStatus.getMissing().isEmpty();
+ return hasChanges;
+ } catch (Exception e) {
+ // ugly workaround to allow us to use egit 2.0 while staying
+ // compatible
+ if (e instanceof NoWorkTreeException) {
+ throw (NoWorkTreeException) e;
+ } else if (e instanceof IOException) {
+ throw (IOException) e;
+ }
+ throw new RuntimeException(e);
+ }
}
public static int countCommitableChanges(IProject project, IServer server, IProgressMonitor monitor) throws CoreException {
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF 2012-07-31 10:48:22 UTC (rev 42804)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.egit.ui/META-INF/MANIFEST.MF 2012-07-31 10:56:26 UTC (rev 42805)
@@ -5,11 +5,11 @@
Bundle-Version: 2.3.1.qualifier
Bundle-Activator: org.jboss.tools.openshift.egit.ui.EGitUIActivator
Require-Bundle: org.jboss.tools.openshift.egit.core;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.egit.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.egit.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jgit;bundle-version="[1.0.0,2.0.0)",
- com.jcraft.jsch;bundle-version="[0.1.41,1.0.0)",
- org.eclipse.ui;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.egit.core;bundle-version="1.0.0",
+ org.eclipse.egit.ui;bundle-version="1.0.0",
+ org.eclipse.jgit;bundle-version="1.0.0",
+ com.jcraft.jsch;bundle-version="0.1.41",
+ org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.core.runtime,
org.eclipse.core.expressions;bundle-version="[3.4.300,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.100,4.0.0)",
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2012-07-31 10:48:22 UTC (rev 42804)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2012-07-31 10:56:26 UTC (rev 42805)
@@ -3,7 +3,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="openshift-java-client-2.0.0-SNAPSHOT.jar" sourcepath="/openshift-java-client"/>
+ <classpathentry exported="true" kind="lib" path="openshift-java-client-2.0.0-SNAPSHOT.jar" sourcepath="/home/adietish/jboss-workspaces/openshift-java-client/src"/>
<classpathentry kind="lib" path="jboss-dmr-1.0.0.Final.jar"/>
<classpathentry kind="lib" path="log4j-1.2.16.jar"/>
<classpathentry kind="lib" path="slf4j-api-1.6.1.jar"/>
Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-07-31 10:48:22 UTC (rev 42804)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2012-07-31 10:56:26 UTC (rev 42805)
@@ -9,9 +9,9 @@
org.jboss.tools.openshift.egit.core;bundle-version="2.3.0",
org.jboss.tools.openshift.egit.ui;bundle-version="2.3.0",
org.jboss.ide.eclipse.as.ui;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.egit.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.egit.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jgit;bundle-version="[1.1.0,2.1.0)",
+ org.eclipse.egit.ui;bundle-version="1.0.0",
+ org.eclipse.egit.core;bundle-version="1.1.0",
+ org.eclipse.jgit;bundle-version="1.1.0",
com.jcraft.jsch;bundle-version="0.1.41",
org.eclipse.jsch.core;bundle-version="[1.1.300,2.0.0)",
org.jboss.ide.eclipse.as.core;bundle-version="2.3.0",
Modified: branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/META-INF/MANIFEST.MF 2012-07-31 10:48:22 UTC (rev 42804)
+++ branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/META-INF/MANIFEST.MF 2012-07-31 10:56:26 UTC (rev 42805)
@@ -6,9 +6,9 @@
Bundle-Activator: org.jboss.tools.openshift.egit.internal.test.EGitTestActivator
Bundle-Vendor: JBoss by Red Hat
Require-Bundle: org.eclipse.egit.core;bundle-version="1.0.0",
- org.eclipse.jgit;bundle-version="[1.0.0,2.0.1]",
+ org.eclipse.jgit;bundle-version="1.0.0",
org.eclipse.core.runtime,
- org.eclipse.core.resources;bundle-version="[3.7.100,4.0.0)",
+ org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.core.filesystem;bundle-version="1.3.100",
org.junit;bundle-version="[4.8.2,5.0.0)",
org.jboss.tools.openshift.egit.core;bundle-version="1.0.0"
Modified: branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/EGitUtilsTest.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/EGitUtilsTest.java 2012-07-31 10:48:22 UTC (rev 42804)
+++ branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/EGitUtilsTest.java 2012-07-31 10:56:26 UTC (rev 42805)
@@ -1,9 +1,9 @@
package org.jboss.tools.openshift.egit.internal.test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
import java.io.File;
import java.io.IOException;
@@ -17,6 +17,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.egit.core.Activator;
+import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.StoredConfig;
@@ -196,7 +197,7 @@
}
@Test
- public void addedButNotCommittedIsDirty() throws IOException {
+ public void addedButNotCommittedIsDirty() throws IOException, GitAPIException {
assertFalse(EGitUtils.isDirty(testRepository.getRepository()));
File file = testRepository.createFile("a.txt", "protoculture");
testRepository.add(file);
Modified: branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/util/TestRepository.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/util/TestRepository.java 2012-07-31 10:48:22 UTC (rev 42804)
+++ branches/jbosstools-3.3.x/openshift/tests/org.jboss.tools.openshift.egit.test/src/org/jboss/tools/openshift/egit/internal/test/util/TestRepository.java 2012-07-31 10:56:26 UTC (rev 42805)
@@ -34,12 +34,10 @@
import org.eclipse.egit.core.op.DisconnectProviderOperation;
import org.eclipse.jgit.api.CommitCommand;
import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException;
+import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.api.errors.NoFilepatternException;
-import org.eclipse.jgit.api.errors.NoHeadException;
-import org.eclipse.jgit.api.errors.NoMessageException;
-import org.eclipse.jgit.api.errors.WrongRepositoryStateException;
+import org.eclipse.jgit.api.errors.UnmergedPathsException;
import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheEntry;
import org.eclipse.jgit.errors.UnmergedPathException;
@@ -132,15 +130,11 @@
* commit message
* @return commit object
* @throws IOException
- * @throws NoHeadException
- * @throws NoMessageException
- * @throws ConcurrentRefUpdateException
* @throws JGitInternalException
- * @throws WrongRepositoryStateException
+ * @throws GitAPIException
*/
public RevCommit createInitialCommit(String message) throws IOException,
- NoHeadException, NoMessageException, ConcurrentRefUpdateException,
- JGitInternalException, WrongRepositoryStateException {
+ JGitInternalException, GitAPIException {
String repoPath = repository.getWorkTree().getAbsolutePath();
File file = new File(repoPath, "dummy");
if (!file.exists())
@@ -252,17 +246,14 @@
* commit message
* @return commit object
*
- * @throws NoHeadException
- * @throws NoMessageException
* @throws UnmergedPathException
- * @throws ConcurrentRefUpdateException
* @throws JGitInternalException
- * @throws WrongRepositoryStateException
+ * @throws GitAPIException
+ * @throws UnmergedPathsException
*/
- public RevCommit commit(String message) throws NoHeadException,
- NoMessageException, UnmergedPathException,
- ConcurrentRefUpdateException, JGitInternalException,
- WrongRepositoryStateException {
+ public RevCommit commit(String message) throws UnmergedPathException,
+ JGitInternalException,
+ UnmergedPathsException, GitAPIException {
Git git = new Git(repository);
CommitCommand commitCommand = git.commit();
commitCommand.setAuthor("J. Git", "j.git(a)egit.org");
@@ -271,7 +262,7 @@
return commitCommand.call();
}
- public void add(IFile file) throws IOException {
+ public void add(IFile file) throws IOException, GitAPIException {
add(new File(file.getLocation().toOSString()));
}
@@ -280,8 +271,9 @@
*
* @param file
* @throws IOException
+ * @throws GitAPIException
*/
- public void add(File file) throws IOException {
+ public void add(File file) throws IOException, GitAPIException {
String repoPath =
getRepoRelativePath(file.getAbsolutePath());
try {
13 years, 2 months