JBoss Tools SVN: r26042 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-10-25 16:41:13 -0400 (Mon, 25 Oct 2010)
New Revision: 26042
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java
Log:
2010-10-25 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java (getPropertyValue): Use
DeltaCloud as source of cloud type constants.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (validate): Ditto.
(createControl): Ditto.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java (createControl): Ditto.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-25 20:40:15 UTC (rev 26041)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-25 20:41:13 UTC (rev 26042)
@@ -1,3 +1,11 @@
+2010-10-25 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java (getPropertyValue): Use
+ DeltaCloud as source of cloud type constants.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (validate): Ditto.
+ (createControl): Ditto.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java (createControl): Ditto.
+
2010-10-22 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImage.java: New file.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-10-25 20:40:15 UTC (rev 26041)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-10-25 20:41:13 UTC (rev 26042)
@@ -117,7 +117,7 @@
// it will be complete for future requests until a refresh gets the
// entire list again.
String key = instance.getKey();
- if (!cloud.getType().equals(DeltaCloudInstance.MOCK_TYPE)) {
+ if (!cloud.getType().equals(DeltaCloud.MOCK_TYPE)) {
if (instance.getState().equals(DeltaCloudInstance.RUNNING) && (key == null || key.length() == 0)) {
instance = cloud.refreshInstance(instance.getId());
if (instance != null) {
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-10-25 20:40:15 UTC (rev 26041)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-10-25 20:41:13 UTC (rev 26042)
@@ -37,7 +37,6 @@
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudHardwareProfile;
import org.jboss.tools.deltacloud.core.DeltaCloudImage;
-import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.core.DeltaCloudRealm;
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants;
@@ -168,7 +167,7 @@
complete = false;
}
- if (cloud.getType().equals(DeltaCloudInstance.EC2_TYPE)) {
+ if (cloud.getType().equals(DeltaCloud.EC2_TYPE)) {
String keyname = keyText.getText();
if (keyname.length() == 0)
complete = false;
@@ -339,7 +338,7 @@
Control control = realm;
- if (cloud.getType().equals(DeltaCloudInstance.EC2_TYPE)) {
+ if (cloud.getType().equals(DeltaCloud.EC2_TYPE)) {
Label keyLabel = new Label(container, SWT.NULL);
keyLabel.setText(WizardMessages.getString(KEY_LABEL));
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java 2010-10-25 20:40:15 UTC (rev 26041)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java 2010-10-25 20:41:13 UTC (rev 26042)
@@ -49,7 +49,6 @@
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudHardwareProfile;
import org.jboss.tools.deltacloud.core.DeltaCloudImage;
-import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.core.DeltaCloudRealm;
import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
import org.jboss.tools.internal.deltacloud.ui.common.databinding.validator.MandatoryStringValidator;
@@ -325,7 +324,7 @@
keyManage = new Button(container, SWT.NULL);
keyManage.setText(WizardMessages.getString(MANAGE_BUTTON_LABEL));
keyManage.addSelectionListener(manageListener);
- if (cloud.getType().equals(DeltaCloudInstance.MOCK_TYPE))
+ if (cloud.getType().equals(DeltaCloud.MOCK_TYPE))
keyManage.setEnabled(false);
Point p1 = nameLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT);
14 years, 2 months
JBoss Tools SVN: r26041 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-10-25 16:40:15 -0400 (Mon, 25 Oct 2010)
New Revision: 26041
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
Log:
2010-10-25 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/DeltaCloud.java: Move cloud type constants
here as the DeltaCloud contains the type field.
* src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java: Move cloud type constants
from here to DeltaCloud.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-10-25 17:24:16 UTC (rev 26040)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-10-25 20:40:15 UTC (rev 26041)
@@ -1,5 +1,12 @@
2010-10-25 Jeff Johnston <jjohnstn(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/core/DeltaCloud.java: Move cloud type constants
+ here as the DeltaCloud contains the type field.
+ * src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java: Move cloud type constants
+ from here to DeltaCloud.
+
+2010-10-25 Jeff Johnston <jjohnstn(a)redhat.com>
+
* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud): Fix constructor
typo caused by copying so that type is passed when it is offered.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-10-25 17:24:16 UTC (rev 26040)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-10-25 20:40:15 UTC (rev 26041)
@@ -35,6 +35,9 @@
public class DeltaCloud {
+ public final static String MOCK_TYPE = "MOCK"; //$NON-NLS-1$
+ public final static String EC2_TYPE = "EC2"; //$NON-NLS-1$
+
private String name;
private String username;
private String url;
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-10-25 17:24:16 UTC (rev 26040)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-10-25 20:40:15 UTC (rev 26041)
@@ -28,9 +28,6 @@
public final static String REBOOT = Instance.Action.REBOOT.toString();
public final static String DESTROY = Instance.Action.DESTROY.toString();
- public final static String EC2_TYPE = "EC2"; //$NON-NLS-1$
- public final static String MOCK_TYPE = "MOCK"; //$NON-NLS-1$
-
private Instance instance;
private String givenName;
14 years, 2 months
JBoss Tools SVN: r26040 - trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-25 13:24:16 -0400 (Mon, 25 Oct 2010)
New Revision: 26040
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml
Log:
comment out the delete/get step to update the jar every time, per Max's say-so (JBDS-1343)
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml 2010-10-25 17:21:48 UTC (rev 26039)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml 2010-10-25 17:24:16 UTC (rev 26040)
@@ -21,10 +21,13 @@
<phase>validate</phase>
<configuration>
<tasks>
+ <!-- JBDS-1343 uncomment this to pull a fresh copy of the jar from this or another location as needed -->
+ <!--
<delete file="modeshape-client.jar" quiet="true" />
<get
src="http://jawa05.englab.brq.redhat.com/candidate/SOA-5.1-ER3/JBDS/modeshape-..."
dest="modeshape-client.jar" usetimestamp="true" />
+ -->
</tasks>
</configuration>
<goals>
14 years, 2 months
JBoss Tools SVN: r26039 - trunk/documentation/whatsnew/smooks.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2010-10-25 13:21:48 -0400 (Mon, 25 Oct 2010)
New Revision: 26039
Modified:
trunk/documentation/whatsnew/smooks/smooks-news-1.2.0.beta1.html
Log:
tweak to smooks what's new for beta1 (updated <title> tag to be 1.2.0.beta1 instead of older value)
Modified: trunk/documentation/whatsnew/smooks/smooks-news-1.2.0.beta1.html
===================================================================
--- trunk/documentation/whatsnew/smooks/smooks-news-1.2.0.beta1.html 2010-10-25 17:12:07 UTC (rev 26038)
+++ trunk/documentation/whatsnew/smooks/smooks-news-1.2.0.beta1.html 2010-10-25 17:21:48 UTC (rev 26039)
@@ -6,7 +6,7 @@
<meta http-equiv="Content-Language" content="en-us" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" href="../whatsnew.css" />
-<title>Smooks tools 1.1.0.M4 What's New</title>
+<title>Smooks tools 1.2.0.beta1 What's New</title>
</head>
<body>
<h1>Smooks tools 1.2.0.beta1 What's New</h1>
14 years, 2 months
JBoss Tools SVN: r26038 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-10-25 13:12:07 -0400 (Mon, 25 Oct 2010)
New Revision: 26038
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizardPage.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
Log:
https://jira.jboss.org/browse/JBIDE-7380 , Validation was added. JUnit was updated.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizardPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizardPage.java 2010-10-25 16:52:44 UTC (rev 26037)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizardPage.java 2010-10-25 17:12:07 UTC (rev 26038)
@@ -357,10 +357,22 @@
*/
updatePropertiesValueStatus();
updateDuplicateValueStatus();
+ /*
+ * When selected text is fine perform further validation
+ */
if (propsValueStatus.isOK()) {
- if (!duplicateValueStatus.isOK()
- && JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_VALUE_EXISTS
- .equalsIgnoreCase(duplicateValueStatus.getMessage())) {
+ /*
+ * Check the bundle for the value in it.
+ * if so -- show the warning and set correct key.
+ */
+ if (!duplicateValueStatus.isOK()) {
+ /*
+ * Set the same key value
+ */
+ propsKey.setText(getValueForKey(propsValue.getText()));
+ /*
+ * Set the new warning message
+ */
applyStatus(this, new IStatus[] {duplicateValueStatus});
} else {
/*
@@ -408,6 +420,9 @@
IMessageProvider.INFORMATION);
}
} else {
+ /*
+ * Set the message about wrong selected text.
+ */
applyStatus(this, new IStatus[] {propsValueStatus});
}
/*
@@ -495,7 +510,29 @@
return isDuplicated;
}
+
/**
+ * Returns the key for the specified value
+ * from the visual table.
+ *
+ * @param value - the value
+ * @return the key or empty string
+ */
+ private String getValueForKey(String value) {
+ String key = Constants.EMPTY;
+ if ((tagsTable.getItemCount() > 0) && (null != value) && !isNewFile()) {
+ TableItem[] items = tagsTable.getItems();
+ for (TableItem tableItem : items) {
+ if (value.equalsIgnoreCase(tableItem.getText(1))) {
+ key = tableItem.getText(0);
+ break;
+ }
+ }
+ }
+ return key;
+ }
+
+ /**
* Update resource bundle table according to the selected file:
* it fills key and value columns.
*
@@ -712,7 +749,9 @@
/*
* Apply status to the dialog
*/
- if (!duplicateValueStatus.isOK()) {
+ if (!duplicateValueStatus.isOK()
+ && getValueForKey(propsValue.getText())
+ .equalsIgnoreCase(propsKey.getText())) {
applyStatus(this, new IStatus[] { propsKeyStatus, propsValueStatus,
duplicateValueStatus});
} else {
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-10-25 16:52:44 UTC (rev 26037)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-10-25 17:12:07 UTC (rev 26038)
@@ -163,7 +163,6 @@
SWTBotEditor editor = SWTTestExt.packageExplorer.openFile(JBT_TEST_PROJECT_NAME,
"WebContent", "pages", TEST_PAGE); //$NON-NLS-1$ //$NON-NLS-2$
editor.setFocus();
-
/*
* Select some text
*/
@@ -205,7 +204,6 @@
editor2.toTextEditor().selectLine(3);
String line = editor2.toTextEditor().getSelection();
assertEquals("'Messages.properties' was updated incorrectly", "User=User", line); //$NON-NLS-1$ //$NON-NLS-2$
-
/*
* Change the property value to the new one, let say 'User1'.
* And externalize the same string again.
@@ -241,6 +239,17 @@
JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
assertNotNull("Cannot find 'Property Key' text field", defKeyText); //$NON-NLS-1$
assertText("User_1",defKeyText); //$NON-NLS-1$
+ assertTrue("(OK) button should be enabled.", //$NON-NLS-1$
+ bot.button(WidgetVariables.OK_BUTTON).isEnabled());
+ /*
+ * Change the key to validate duplicate key situation
+ */
+ defKeyText.setText("User"); //$NON-NLS-1$
+ assertTrue("(OK) button should be disabled.", //$NON-NLS-1$
+ !bot.button(WidgetVariables.OK_BUTTON).isEnabled());
+ defKeyText.setText("User_1"); //$NON-NLS-1$
+ assertTrue("(OK) button should be enabled.", //$NON-NLS-1$
+ bot.button(WidgetVariables.OK_BUTTON).isEnabled());
bot.button(WidgetVariables.OK_BUTTON).click();
isUnusedDialogOpened = false;
/*
14 years, 2 months
JBoss Tools SVN: r26037 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-10-25 12:52:44 -0400 (Mon, 25 Oct 2010)
New Revision: 26037
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
Log:
2010-10-25 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud): Fix constructor
typo caused by copying so that type is passed when it is offered.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-10-25 16:47:26 UTC (rev 26036)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-10-25 16:52:44 UTC (rev 26037)
@@ -1,3 +1,8 @@
+2010-10-25 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud): Fix constructor
+ typo caused by copying so that type is passed when it is offered.
+
2010-10-22 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (DeltaCloud): Don't add
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-10-25 16:47:26 UTC (rev 26036)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-10-25 16:52:44 UTC (rev 26037)
@@ -60,7 +60,7 @@
public DeltaCloud(String name, String url, String username, String passwd,
String type, boolean persistent) throws MalformedURLException {
- this(name, url, username, passwd, null, persistent, IImageFilter.ALL_STRING, IInstanceFilter.ALL_STRING);
+ this(name, url, username, passwd, type, persistent, IImageFilter.ALL_STRING, IInstanceFilter.ALL_STRING);
}
public DeltaCloud(String name, String url, String username, String passwd,
14 years, 2 months
JBoss Tools SVN: r26036 - in trunk/jst/plugins/org.jboss.tools.jst.jsp: src/org/jboss/tools/jst/jsp/jspeditor and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-10-25 12:47:26 -0400 (Mon, 25 Oct 2010)
New Revision: 26036
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/handlers/SelectionBarHandler.java
Log:
https://jira.jboss.org/browse/JBIDE-7390
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2010-10-25 16:39:34 UTC (rev 26035)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2010-10-25 16:47:26 UTC (rev 26036)
@@ -313,9 +313,23 @@
id="org.jboss.tools.jst.jsp.menus.showSelectionBar"
style="toggle"
mnemonic="S">
- <visibleWhen checkEnabled="false">
- <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
- </visibleWhen>
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeEditorId">
+ <or>
+ <equals
+ value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor">
+ </equals>
+ <equals
+ value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor">
+ </equals>
+ <equals
+ value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor">
+ </equals>
+ </or>
+ </with>
+ </visibleWhen>
</command>
</menuContribution>
<menuContribution
@@ -326,9 +340,23 @@
id="org.jboss.tools.jst.jsp.toolbars.showSelectionBar"
style="toggle"
tooltip="%Toggle.Selection.Bar">
- <visibleWhen checkEnabled="false">
- <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
- </visibleWhen>
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeEditorId">
+ <or>
+ <equals
+ value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor">
+ </equals>
+ <equals
+ value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor">
+ </equals>
+ <equals
+ value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor">
+ </equals>
+ </or>
+ </with>
+ </visibleWhen>
</command>
</menuContribution>
@@ -352,9 +380,23 @@
commandId="org.jboss.tools.jst.jsp.commands.i18"
id="org.jboss.tools.jst.jsp.menus.i18"
mnemonic="S">
- <visibleWhen checkEnabled="false">
- <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
- </visibleWhen>
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeEditorId">
+ <or>
+ <equals
+ value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor">
+ </equals>
+ <equals
+ value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor">
+ </equals>
+ <equals
+ value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor">
+ </equals>
+ </or>
+ </with>
+ </visibleWhen>
</command>
</menuContribution>
<menuContribution
@@ -366,9 +408,23 @@
icon="icons/externalize.png"
id="org.jboss.tools.jst.jsp.toolbars.i18"
tooltip="%Externalize.Selected.Property">
- <visibleWhen checkEnabled="false">
- <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
- </visibleWhen>
+ <visibleWhen
+ checkEnabled="false">
+ <with
+ variable="activeEditorId">
+ <or>
+ <equals
+ value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor">
+ </equals>
+ <equals
+ value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor">
+ </equals>
+ <equals
+ value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor">
+ </equals>
+ </or>
+ </with>
+ </visibleWhen>
</command>
</toolbar>
</menuContribution>
@@ -470,17 +526,6 @@
<handler
class="org.jboss.tools.jst.jsp.selection.bar.handlers.SelectionBarHandler"
commandId="org.jboss.tools.jst.jsp.commands.showSelectionBar">
- <activeWhen>
- <with variable="activeContexts">
- <iterate operator="or">
- <equals value="org.jboss.tools.jst.jsp.selectionBar.context"/>
- </iterate>
- </with>
- </activeWhen>
-
- <enabledWhen>
- <reference definitionId="org.jboss.tools.ui.structuredEditor"/>
- </enabledWhen>
</handler>
<handler
class="org.jboss.tools.jst.jsp.i18n.handlers.I18Handler"
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2010-10-25 16:39:34 UTC (rev 26035)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2010-10-25 16:47:26 UTC (rev 26036)
@@ -25,7 +25,6 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.draw2d.GridData;
import org.eclipse.gef.ui.views.palette.PalettePage;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuListener;
@@ -53,7 +52,6 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
-import org.eclipse.ui.contexts.IContextActivation;
import org.eclipse.ui.contexts.IContextService;
import org.eclipse.ui.ide.IGotoMarker;
import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
@@ -81,14 +79,12 @@
import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.XModelTreeListenerSWTASync;
-import org.jboss.tools.common.model.util.XModelTreeListenerSWTSync;
import org.jboss.tools.common.text.ext.IMultiPageEditor;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.bundle.BundleMap;
import org.jboss.tools.jst.jsp.editor.IVisualEditor;
import org.jboss.tools.jst.jsp.editor.IVisualEditorFactory;
import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
-import org.jboss.tools.jst.jsp.selection.bar.SelectionBar;
import org.jboss.tools.jst.web.tld.VpeTaglibManager;
import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider;
@@ -138,7 +134,6 @@
static IVisualEditorFactory visualEditorFactory;
- private IContextActivation selBarContextActivation;
//added by Maksim Areshkau, notified externalize command that selection changed
private ISelectionChangedListener externalizeSelectionChangeListener = new ISelectionChangedListener() {
@@ -245,17 +240,12 @@
visualEditor.setVisualMode(IVisualEditor.PREVIEW_MODE);
}
}
- //fix for JBIDE-7059, author Maksim Areshkau
- IContextService contextService = (IContextService) getSite()
- .getService(IContextService.class);
- if(newPageIndex!=getPreviewIndex()){
- if(selBarContextActivation==null)
- selBarContextActivation = contextService.activateContext(SelectionBar.SELECTION_BAR_CONTEXT_ID);
- } else if(selBarContextActivation!=null){
- contextService.deactivateContext(selBarContextActivation);
- selBarContextActivation=null;
- }
+ ICommandService commandService = (ICommandService) PlatformUI
+ .getWorkbench().getService(ICommandService.class);
+ commandService.refreshElements("org.jboss.tools.jst.jsp.commands.showSelectionBar", null); //$NON-NLS-1$
+
+
superPageChange(newPageIndex);
JspEditorPlugin.getDefault().getPreferenceStore().
setValue(IVpePreferencesPage.DEFAULT_VPE_TAB, selectedPageIndex);
@@ -647,10 +637,6 @@
}
IContextService contextService = (IContextService) getSite()
.getService(IContextService.class);
- if(selBarContextActivation!=null){
- contextService.deactivateContext(selBarContextActivation);
- selBarContextActivation=null;
- }
super.dispose();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2010-10-25 16:39:34 UTC (rev 26035)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2010-10-25 16:47:26 UTC (rev 26036)
@@ -19,6 +19,7 @@
import org.eclipse.core.commands.ICommandListener;
import org.eclipse.core.commands.IStateListener;
import org.eclipse.core.commands.State;
+import org.eclipse.gef.Handle;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.swt.SWT;
@@ -52,6 +53,7 @@
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.handlers.HandlerUtil;
import org.eclipse.ui.internal.IWorkbenchGraphicConstants;
import org.eclipse.ui.internal.WorkbenchImages;
import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
@@ -75,7 +77,6 @@
*/
public class SelectionBar extends Composite implements ISelectionChangedListener, IStateListener,ICommandListener{
private static final int SEL_ITEM_RIGHT_MARGIN = 5;
- public static final String SELECTION_BAR_CONTEXT_ID="org.jboss.tools.jst.jsp.selectionBar.context"; //$NON-NLS-1$
/*
* The main composite that holds all other controls
*/
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/handlers/SelectionBarHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/handlers/SelectionBarHandler.java 2010-10-25 16:39:34 UTC (rev 26035)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/handlers/SelectionBarHandler.java 2010-10-25 16:47:26 UTC (rev 26036)
@@ -11,16 +11,37 @@
package org.jboss.tools.jst.jsp.selection.bar.handlers;
+import java.util.Map;
+
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.HandlerEvent;
import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.IElementUpdater;
import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.ui.menus.UIElement;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
/**
* Selection bar handler
*/
-public class SelectionBarHandler extends AbstractHandler {
+public class SelectionBarHandler extends AbstractHandler implements IElementUpdater{
+
+ @Override
+ public boolean isEnabled() {
+ boolean result=false;
+ IEditorPart activeEditor= PlatformUI
+ .getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+ if(activeEditor instanceof JSPMultiPageEditor){
+ JSPMultiPageEditor jspEditor = (JSPMultiPageEditor) activeEditor;
+ if(jspEditor.getSelectedPageIndex()!=jspEditor.getPreviewIndex()){
+ result=true;
+ }
+ }
+ return result;
+ }
/**
* The constructor.
*/
@@ -32,14 +53,12 @@
* from the application context.
*/
public Object execute(ExecutionEvent event) throws ExecutionException {
-// IEditorPart activeEditor = HandlerUtil.getActiveEditorChecked(event);
HandlerUtil.toggleCommandState(event.getCommand());
-// if(!togleState){
-// ((ISelectionBarController)activeEditor).showSelectionBar();
-// }else{
-// ((ISelectionBarController)activeEditor).hideSelectionBar();
-// }
return null;
}
+ public void updateElement(UIElement element, Map parameters) {
+ fireHandlerChanged(new HandlerEvent(this, true, false));
+ }
+
}
14 years, 2 months
JBoss Tools SVN: r26035 - trunk/tests/features/org.jboss.tools.test.sdk.feature.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-25 12:39:34 -0400 (Mon, 25 Oct 2010)
New Revision: 26035
Modified:
trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml
Log:
JBDS-1350 remove modeshape test from JBDS SDK test feature
Modified: trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-10-25 15:29:32 UTC (rev 26034)
+++ trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-10-25 16:39:34 UTC (rev 26035)
@@ -338,10 +338,10 @@
install-size="0"
version="0.0.0"/>
- <plugin
+ <!--<plugin
id="org.jboss.tools.modeshape.rest.test"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="0.0.0"/>-->
</feature>
14 years, 2 months
JBoss Tools SVN: r26034 - trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-10-25 11:29:32 -0400 (Mon, 25 Oct 2010)
New Revision: 26034
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/WebVerificationTest.java
Log:
JBIDE-7405
https://jira.jboss.org/browse/JBIDE-7405
Replaced string reference by constant reference.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/WebVerificationTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/WebVerificationTest.java 2010-10-25 14:55:46 UTC (rev 26033)
+++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/WebVerificationTest.java 2010-10-25 15:29:32 UTC (rev 26034)
@@ -18,6 +18,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
+import org.jboss.tools.common.model.markers.ResourceMarkers;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
import org.jboss.tools.test.util.TestProjectProvider;
@@ -27,7 +28,7 @@
public class WebVerificationTest extends TestCase {
public static final String TEST_PROJECT_NAME = "Test";
- static String MARKER_TYPE = "org.jboss.tools.jst.web.ui.strutsmarker";
+ static String MARKER_TYPE = ResourceMarkers.JST_WEB_PROBLEM;
public static final String TEST_PROJECT_PATH = "/projects/" + TEST_PROJECT_NAME;
14 years, 2 months
JBoss Tools SVN: r26033 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-25 10:55:46 -0400 (Mon, 25 Oct 2010)
New Revision: 26033
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
Log:
[JBIDE-7402] cleanup: extracted storePassword() method
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-10-25 14:32:07 UTC (rev 26032)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-10-25 14:55:46 UTC (rev 26033)
@@ -84,14 +84,7 @@
instanceFilter.setRules(IInstanceFilter.ALL_STRING);
}
if (persistent) {
- ISecurePreferences root = SecurePreferencesFactory.getDefault();
- String key = DeltaCloud.getPreferencesKey(url, username);
- ISecurePreferences node = root.node(key);
- try {
- node.put("password", passwd, true /*encrypt*/);
- } catch (StorageException e) {
- e.printStackTrace();
- }
+ storePassword(url, username, passwd);
}
}
@@ -101,6 +94,10 @@
this.name = name;
this.username = username;
this.type = type;
+ storePassword(url, username, passwd);
+ }
+
+ private void storePassword(String url, String username, String passwd) {
ISecurePreferences root = SecurePreferencesFactory.getDefault();
String key = DeltaCloud.getPreferencesKey(url, username);
ISecurePreferences node = root.node(key);
14 years, 2 months