JBoss Tools SVN: r27157 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-03 13:46:15 -0500 (Fri, 03 Dec 2010)
New Revision: 27157
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java
Removed:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java
Log:
[JBIDE-7688] renamed InstanceFilter to InstanceFilterWizard since it is a wizard (and shall not be mixed up with the filter IntanceFilter)
Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java 2010-12-03 18:44:17 UTC (rev 27156)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java 2010-12-03 18:46:15 UTC (rev 27157)
@@ -1,59 +0,0 @@
-package org.jboss.tools.internal.deltacloud.ui.wizards;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Display;
-import org.jboss.tools.deltacloud.core.DeltaCloud;
-import org.jboss.tools.deltacloud.core.DeltaCloudManager;
-import org.jboss.tools.deltacloud.ui.ErrorUtils;
-
-public class InstanceFilter extends Wizard {
-
- private DeltaCloud cloud;
- private InstanceFilterPage mainPage;
-
- public InstanceFilter(DeltaCloud cloud) {
- this.cloud = cloud;
- }
-
- @Override
- public void addPages() {
- // TODO Auto-generated method stub
- mainPage = new InstanceFilterPage(cloud);
- addPage(mainPage);
- }
-
- @Override
- public boolean canFinish() {
- return mainPage.isPageComplete();
- }
-
- @Override
- public boolean performFinish() {
- String nameRule = mainPage.getNameRule();
- String idRule = mainPage.getIdRule();
- String imageIdRule = mainPage.getImageIdRule();
- String ownerIdRule = mainPage.getOwnerIdRule();
- String keyNameRule = mainPage.getKeyNameRule();
- String realmRule = mainPage.getRealmRule();
- String profileRule = mainPage.getProfileRule();
-
- try {
- cloud.updateInstanceFilter(nameRule + ";" + //$NON-NLS-1$
- idRule + ";" + //$NON-NLS-1$
- imageIdRule + ";" + //$NON-NLS-1$
- ownerIdRule + ";" + //$NON-NLS-1$
- keyNameRule + ";" + //$NON-NLS-1$
- realmRule + ";" + //$NON-NLS-1$
- profileRule);
- DeltaCloudManager.getDefault().saveClouds();
- } catch (Exception e) {
- // TODO: internationalize strings
- ErrorUtils.handleError(
- "Error",
- "Could not update filters", e, Display.getDefault().getActiveShell());
- }
-
- return true;
- }
-
-}
Copied: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java (from rev 27061, trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java)
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java 2010-12-03 18:46:15 UTC (rev 27157)
@@ -0,0 +1,58 @@
+package org.jboss.tools.internal.deltacloud.ui.wizards;
+
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudManager;
+import org.jboss.tools.deltacloud.ui.ErrorUtils;
+
+public class InstanceFilterWizard extends Wizard {
+
+ private DeltaCloud cloud;
+ private InstanceFilterPage mainPage;
+
+ public InstanceFilterWizard(DeltaCloud cloud) {
+ this.cloud = cloud;
+ }
+
+ @Override
+ public void addPages() {
+ mainPage = new InstanceFilterPage(cloud);
+ addPage(mainPage);
+ }
+
+ @Override
+ public boolean canFinish() {
+ return mainPage.isPageComplete();
+ }
+
+ @Override
+ public boolean performFinish() {
+ String nameRule = mainPage.getNameRule();
+ String idRule = mainPage.getIdRule();
+ String imageIdRule = mainPage.getImageIdRule();
+ String ownerIdRule = mainPage.getOwnerIdRule();
+ String keyNameRule = mainPage.getKeyNameRule();
+ String realmRule = mainPage.getRealmRule();
+ String profileRule = mainPage.getProfileRule();
+
+ try {
+ cloud.updateInstanceFilter(nameRule + ";" + //$NON-NLS-1$
+ idRule + ";" + //$NON-NLS-1$
+ imageIdRule + ";" + //$NON-NLS-1$
+ ownerIdRule + ";" + //$NON-NLS-1$
+ keyNameRule + ";" + //$NON-NLS-1$
+ realmRule + ";" + //$NON-NLS-1$
+ profileRule);
+ DeltaCloudManager.getDefault().saveClouds();
+ } catch (Exception e) {
+ // TODO: internationalize strings
+ ErrorUtils.handleError(
+ "Error",
+ "Could not update filters", e, Display.getDefault().getActiveShell());
+ }
+
+ return true;
+ }
+
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilterWizard.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 1 month
JBoss Tools SVN: r27156 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-03 13:44:17 -0500 (Fri, 03 Dec 2010)
New Revision: 27156
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AbstractDeltaCloudElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IDeltaCloudElement.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
Log:
[JBIDE-7688] provide common superclass and interface to DeltaCloudImage and DeltaCloudInstance
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AbstractDeltaCloudElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AbstractDeltaCloudElement.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AbstractDeltaCloudElement.java 2010-12-03 18:44:17 UTC (rev 27156)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are 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 Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.jboss.tools.deltacloud.core;
+
+
+/**
+ * A common superclass for cloud elements. Currently know subclasses are DeltaCloudImage and DeltaCloudInstance.
+ *
+ * @see DeltaCloudInstance
+ * @see DeltaCloudImage
+ *
+ * @author Andre Dietisheim
+ */
+public abstract class AbstractDeltaCloudElement implements IDeltaCloudElement {
+
+ private DeltaCloud cloud;
+
+ protected AbstractDeltaCloudElement(DeltaCloud cloud) {
+ this.cloud = cloud;
+ }
+
+ public DeltaCloud getDeltaCloud() {
+ return cloud;
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AbstractDeltaCloudElement.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java 2010-12-03 18:43:44 UTC (rev 27155)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudImage.java 2010-12-03 18:44:17 UTC (rev 27156)
@@ -13,14 +13,23 @@
import org.jboss.tools.deltacloud.core.client.Image;
-public class DeltaCloudImage {
+/**
+ * A image that may be reached on a DeltaCloud instance. Wraps Image from upper layers.
+ *
+ * @see Image
+ * @see DeltaCloud
+ *
+ * @author Jeff Johnston
+ * @author Andre Dietisheim
+ */
+public class DeltaCloudImage extends AbstractDeltaCloudElement {
private Image image;
private DeltaCloud deltaCloud;
public DeltaCloudImage(Image image, DeltaCloud deltaCloud) {
+ super(deltaCloud);
this.image = image;
- this.deltaCloud = deltaCloud;
}
public DeltaCloud getDeltaCloud() {
@@ -31,6 +40,10 @@
return image.getName();
}
+ public String getId() {
+ return image.getId();
+ }
+
public String getArchitecture() {
return image.getArchitecture();
}
@@ -38,8 +51,4 @@
public String getDescription() {
return image.getDescription();
}
-
- public String getId() {
- return image.getId();
- }
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-12-03 18:43:44 UTC (rev 27155)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-12-03 18:44:17 UTC (rev 27156)
@@ -18,7 +18,16 @@
import org.jboss.tools.deltacloud.core.client.InstanceAction;
import org.jboss.tools.deltacloud.core.client.InternalDeltaCloudClient;
-public class DeltaCloudInstance {
+/**
+ * An instance that may be reached on a DeltaCloud instance. Wraps Instance from upper layers.
+ *
+ * @see Instance
+ * @see DeltaCloud
+ *
+ * @author Jeff Johnston
+ * @author Andre Dietisheim
+ */
+public class DeltaCloudInstance extends AbstractDeltaCloudElement {
public final static String PENDING = Instance.InstanceState.PENDING.toString();
public final static String RUNNING = Instance.InstanceState.RUNNING.toString();
@@ -31,12 +40,11 @@
public final static String REBOOT = InstanceAction.REBOOT;
public final static String DESTROY = InstanceAction.DESTROY;
- private DeltaCloud cloud;
private Instance instance;
private String givenName;
public DeltaCloudInstance(DeltaCloud cloud, Instance instance) {
- this.cloud = cloud;
+ super(cloud);
this.instance = instance;
}
@@ -119,10 +127,6 @@
return hostNames.get(0);
return null;
}
-
- public DeltaCloud getDeltaCloud() {
- return cloud;
- }
protected boolean performInstanceAction(String actionId, InternalDeltaCloudClient client)
throws DeltaCloudClientException {
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IDeltaCloudElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IDeltaCloudElement.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IDeltaCloudElement.java 2010-12-03 18:44:17 UTC (rev 27156)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are 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 Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.jboss.tools.deltacloud.core;
+
+/**
+ * A common interface for all elements of a cloud. Currently known implementors
+ * are DeltaCloudImage and DeltaCloudInstance.
+ *
+ * @see DeltaCloudImage
+ * @see DeltaCloudInstace
+ *
+ * @author Andre Dietisheim
+ */
+public interface IDeltaCloudElement {
+
+ public DeltaCloud getDeltaCloud();
+
+ public String getName();
+
+ public String getId();
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IDeltaCloudElement.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 1 month
JBoss Tools SVN: r27155 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-03 13:43:44 -0500 (Fri, 03 Dec 2010)
New Revision: 27155
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
Log:
cleanup (removed commented code)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-12-03 17:54:55 UTC (rev 27154)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-12-03 18:43:44 UTC (rev 27155)
@@ -89,7 +89,6 @@
clouds.add(cloud);
cloud.setLastImageId(lastImageId);
cloud.setLastKeyname(lastKeyName);
- // cloud.loadChildren();
return cloud;
} catch (DeltaCloudException e) {
throw e;
14 years, 1 month
JBoss Tools SVN: r27154 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-12-03 12:54:55 -0500 (Fri, 03 Dec 2010)
New Revision: 27154
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java
Log:
https://jira.jboss.org/browse/JBIDE-6575
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2010-12-03 16:50:25 UTC (rev 27153)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/preferences/CDIPreferenceInitializer.java 2010-12-03 17:54:55 UTC (rev 27154)
@@ -51,7 +51,7 @@
defaultPreferences.put(CDIPreferences.ILLEGAL_CONDITIONAL_OBSERVER, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.MISSING_OR_INCORRECT_TARGET_OR_RETENTION_IN_ANNOTATION_TYPE, CDIPreferences.WARNING);
defaultPreferences.put(CDIPreferences.DECORATOR_RESOLVES_TO_FINAL_BEAN, CDIPreferences.WARNING);
- defaultPreferences.put(CDIPreferences.INCONSISTENT_SPECIALIZATION, CDIPreferences.WARNING);
+// defaultPreferences.put(CDIPreferences.INCONSISTENT_SPECIALIZATION, CDIPreferences.WARNING);
defaultPreferences.putInt(SeverityPreferences.MAX_NUMBER_OF_MARKERS_PREFERENCE_NAME, SeverityPreferences.DEFAULT_MAX_NUMBER_OF_MARKERS_PER_FILE);
}
}
\ No newline at end of file
14 years, 1 month
JBoss Tools SVN: r27153 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-03 11:50:25 -0500 (Fri, 03 Dec 2010)
New Revision: 27153
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java
Log:
[JBIDE-7688] renamed ImageFilter to ImageFilterWizard since it is a wizard
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java 2010-12-03 16:50:07 UTC (rev 27152)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/FilterImagesHandler.java 2010-12-03 16:50:25 UTC (rev 27153)
@@ -24,7 +24,7 @@
import org.eclipse.ui.handlers.HandlerUtil;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils;
-import org.jboss.tools.internal.deltacloud.ui.wizards.ImageFilter;
+import org.jboss.tools.internal.deltacloud.ui.wizards.ImageFilterWizard;
/**
* @author Andre Dietisheim
@@ -47,7 +47,7 @@
Display.getDefault().asyncExec(new Runnable() {
@Override
public void run() {
- IWizard wizard = new ImageFilter(cloud);
+ IWizard wizard = new ImageFilterWizard(cloud);
WizardDialog dialog = new WizardDialog(shell, wizard);
dialog.create();
dialog.open();
14 years, 1 month
JBoss Tools SVN: r27152 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: tools and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-12-03 11:50:07 -0500 (Fri, 03 Dec 2010)
New Revision: 27152
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java
Log:
Fixes for JBDS 4.0.0.Beta2
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java 2010-12-03 16:48:50 UTC (rev 27151)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java 2010-12-03 16:50:07 UTC (rev 27152)
@@ -91,6 +91,8 @@
"",
SWTBotWebBrowser.ZOOM_MENU_LABEL,
"",
+ SWTBotWebBrowser.PREFERENCES_MENU_LABEL,
+ "",
SWTBotWebBrowser.PASTE_MENU_LABEL});
}
@@ -111,9 +113,12 @@
SWTBotWebBrowser.INSERT_AFTER_MENU_LABEL,
SWTBotWebBrowser.INSERT_INTO_MENU_LABEL,
SWTBotWebBrowser.REPLACE_WITH_MENU_LABEL,
+ SWTBotWebBrowser.EXTERNALIZE_STRING_MENU_LABEL,
"",
SWTBotWebBrowser.ZOOM_MENU_LABEL,
"",
+ SWTBotWebBrowser.PREFERENCES_MENU_LABEL,
+ "",
SWTBotWebBrowser.CUT_MENU_LABEL,
SWTBotWebBrowser.COPY_MENU_LABEL,
SWTBotWebBrowser.PASTE_MENU_LABEL});
@@ -135,9 +140,12 @@
SWTBotWebBrowser.INSERT_INTO_MENU_LABEL,
SWTBotWebBrowser.REPLACE_WITH_MENU_LABEL,
SWTBotWebBrowser.STRIP_TAG_MENU_LABEL,
+ SWTBotWebBrowser.EXTERNALIZE_STRING_MENU_LABEL,
"",
SWTBotWebBrowser.ZOOM_MENU_LABEL,
"",
+ SWTBotWebBrowser.PREFERENCES_MENU_LABEL,
+ "",
SWTBotWebBrowser.CUT_MENU_LABEL,
SWTBotWebBrowser.COPY_MENU_LABEL,
SWTBotWebBrowser.PASTE_MENU_LABEL});
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2010-12-03 16:48:50 UTC (rev 27151)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2010-12-03 16:50:07 UTC (rev 27152)
@@ -87,6 +87,8 @@
public static final String PASTE_MENU_LABEL = "Paste";
public static final String SETUP_VISUAL_TEMPLATE_FOR_MENU_LABEL = "Setup Visual Template for ";
public static final String SELECT_THIS_TAG_MENU_LABEL = "Select This Tag";
+ public static final String PREFERENCES_MENU_LABEL = "Preferences..";
+ public static final String EXTERNALIZE_STRING_MENU_LABEL = "Externalize strings...";
public static final String JSF_MENU_LABEL = "JSF";
public static final String JBOSS_MENU_LABEL = "JBoss";
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java 2010-12-03 16:48:50 UTC (rev 27151)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java 2010-12-03 16:50:07 UTC (rev 27152)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.vpe.ui.bot.test.wizard;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
@@ -58,6 +59,7 @@
bot.checkBox(IDELabel.NewXHTMLFileDialog.USE_XHTML_TEMPLATE_CHECK_BOX).select();
bot.table().select(IDELabel.NewXHTMLFileDialog.TEMPLATE_FACELET_FORM_XHTML_NAME);
bot.button(IDELabel.Button.FINISH).click();
+ bot.sleep(Timing.time2S());
assertEquals("Active Editor Title should be" ,"test.xhtml", this.bot.activeEditor().getTitle()); //$NON-NLS-1$ //$NON-NLS-2$
}
14 years, 1 month
JBoss Tools SVN: r27151 - trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-12-03 11:48:50 -0500 (Fri, 03 Dec 2010)
New Revision: 27151
Modified:
trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java
Log:
Fixes for JBDS 4.0.0.Beta2
Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java
===================================================================
--- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2010-12-03 16:25:24 UTC (rev 27150)
+++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2010-12-03 16:48:50 UTC (rev 27151)
@@ -303,6 +303,7 @@
// Import File From Repository
eclipse.createNew(EntityType.RESOURCES_FROM_GUVNOR);
bot.button(IDELabel.Button.NEXT).click();
+ bot.sleep(Timing.time2S());
SWTEclipseExt.getTreeItemOnPath(
bot,
bot.tree(),
@@ -353,7 +354,15 @@
SWTBotTreeItem tiRoot = guvnorRepositories.selectTreeItem(IDELabel.GuvnorRepositories.GUVNOR_REPOSITORY_ROOT_TREE_ITEM,null)
.doubleClick();
bot.sleep(Timing.time5S());
- SWTBot dialogBot = bot.shell("").activate().bot();
+ SWTBotShell activeShell = bot.activeShell();
+ SWTBot dialogBot = null;
+ if (activeShell.getText().length() != 0){
+ dialogBot = bot.shell("").activate().bot();
+ }
+ else{
+ dialogBot = activeShell.bot();
+ }
+
dialogBot.textWithLabel(IDELabel.GuvnorConsoleLoginDialog.USER_NAME).setText(
GuvnorRepositoriesTest.GUVNOR_USER_NAME);
dialogBot.textWithLabel(IDELabel.GuvnorConsoleLoginDialog.PASSWORD).setText(
14 years, 1 month
JBoss Tools SVN: r27150 - branches/jbosstools-3.2.0.Beta2/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-12-03 11:25:24 -0500 (Fri, 03 Dec 2010)
New Revision: 27150
Modified:
branches/jbosstools-3.2.0.Beta2/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java
Log:
https://jira.jboss.org/browse/JBIDE-7781
Modified: branches/jbosstools-3.2.0.Beta2/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java
===================================================================
--- branches/jbosstools-3.2.0.Beta2/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java 2010-12-03 16:12:30 UTC (rev 27149)
+++ branches/jbosstools-3.2.0.Beta2/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java 2010-12-03 16:25:24 UTC (rev 27150)
@@ -145,18 +145,24 @@
}
}
- private static Pattern varsPattern = Pattern.compile(".vars\\[\"(.*)\"\\]\\[\"(.*)\"\\]");
+ private static Pattern varsSinglePattern = Pattern.compile(".vars\\[\"(.*)\"\\]");
+ private static Pattern varsDoublePattern = Pattern.compile(".vars\\[\"(.*)\"\\]\\[\"(.*)\"\\]");
public static String normalizePath(String srcPath) {
- Matcher matcher = varsPattern.matcher(srcPath);
- if(matcher.matches()) {
- return matcher.group(1) + "/" + matcher.group(2);
+ Matcher doubleMatcher = varsDoublePattern.matcher(srcPath);
+ if(doubleMatcher.matches()) {
+ return doubleMatcher.group(1) + "/" + doubleMatcher.group(2);
} else {
- return srcPath;
+ Matcher singleMatcher = varsSinglePattern.matcher(srcPath);
+ if(singleMatcher.matches()) {
+ return singleMatcher.group(1);
+ } else {
+ return srcPath;
+ }
}
}
public static String[] toPathTokens(String srcPath) {
- Matcher matcher = varsPattern.matcher(srcPath);
+ Matcher matcher = varsDoublePattern.matcher(srcPath);
if(matcher.matches()) {
return (matcher.group(1) + "/" + matcher.group(2)).split("/");
} else if(srcPath.indexOf("/") != -1) {
@@ -172,7 +178,7 @@
}
public static boolean isVarsFormat(String srcPath) {
- Matcher matcher = varsPattern.matcher(srcPath);
+ Matcher matcher = varsDoublePattern.matcher(srcPath);
return matcher.matches();
}
}
\ No newline at end of file
14 years, 1 month
JBoss Tools SVN: r27149 - trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-12-03 11:12:30 -0500 (Fri, 03 Dec 2010)
New Revision: 27149
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java
Log:
https://jira.jboss.org/browse/JBIDE-7781
Java2Csv mapping isn't stored in smooks configuration
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java 2010-12-03 15:25:52 UTC (rev 27148)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/util/FreeMarkerUtil.java 2010-12-03 16:12:30 UTC (rev 27149)
@@ -145,18 +145,24 @@
}
}
- private static Pattern varsPattern = Pattern.compile(".vars\\[\"(.*)\"\\]\\[\"(.*)\"\\]");
+ private static Pattern varsSinglePattern = Pattern.compile(".vars\\[\"(.*)\"\\]");
+ private static Pattern varsDoublePattern = Pattern.compile(".vars\\[\"(.*)\"\\]\\[\"(.*)\"\\]");
public static String normalizePath(String srcPath) {
- Matcher matcher = varsPattern.matcher(srcPath);
- if(matcher.matches()) {
- return matcher.group(1) + "/" + matcher.group(2);
+ Matcher doubleMatcher = varsDoublePattern.matcher(srcPath);
+ if(doubleMatcher.matches()) {
+ return doubleMatcher.group(1) + "/" + doubleMatcher.group(2);
} else {
- return srcPath;
+ Matcher singleMatcher = varsSinglePattern.matcher(srcPath);
+ if(singleMatcher.matches()) {
+ return singleMatcher.group(1);
+ } else {
+ return srcPath;
+ }
}
}
public static String[] toPathTokens(String srcPath) {
- Matcher matcher = varsPattern.matcher(srcPath);
+ Matcher matcher = varsDoublePattern.matcher(srcPath);
if(matcher.matches()) {
return (matcher.group(1) + "/" + matcher.group(2)).split("/");
} else if(srcPath.indexOf("/") != -1) {
@@ -172,7 +178,7 @@
}
public static boolean isVarsFormat(String srcPath) {
- Matcher matcher = varsPattern.matcher(srcPath);
+ Matcher matcher = varsDoublePattern.matcher(srcPath);
return matcher.matches();
}
}
\ No newline at end of file
14 years, 1 month
JBoss Tools SVN: r27148 - trunk/cdi/plugins/org.jboss.tools.cdi.xml.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-12-03 10:25:52 -0500 (Fri, 03 Dec 2010)
New Revision: 27148
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml
Log:
JBIDE-7796
https://jira.jboss.org/browse/JBIDE-7796
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml 2010-12-03 14:56:12 UTC (rev 27147)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/plugin.xml 2010-12-03 15:25:52 UTC (rev 27148)
@@ -28,7 +28,15 @@
<extension point="org.eclipse.wst.xml.core.catalogContributions">
<catalogContribution id="default">
+ <uri
+ name="http://jboss.org/schema/weld/beans_1_1.xsd"
+ uri="platform:/plugin/org.jboss.tools.cdi.xml/schemas/beans_1_1.xsd"/>
+ <uri
+ name="http://jboss.org/schema/cdi/beans_1_0.xsd"
+ uri="platform:/plugin/org.jboss.tools.cdi.xml/schemas/beans.xsd"/>
+
+
</catalogContribution>
</extension>
14 years, 1 month