JBoss Tools SVN: r34928 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui: icons/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-09-21 12:37:09 -0400 (Wed, 21 Sep 2011)
New Revision: 34928
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/wizard/annotation.png
trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/wizard/bean_class.png
trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/wizard/beans_xml.png
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
Log:
We need icon images for CDI Tools UI https://issues.jboss.org/browse/JBIDE-9717
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/wizard/annotation.png
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/wizard/annotation.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/wizard/bean_class.png
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/wizard/bean_class.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/wizard/beans_xml.png
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/icons/wizard/beans_xml.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-09-21 16:28:01 UTC (rev 34927)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-09-21 16:37:09 UTC (rev 34928)
@@ -183,7 +183,7 @@
<wizard
category="org.jboss.tools.cdi.ui"
class="org.jboss.tools.cdi.ui.wizard.NewQualifierCreationWizard"
- icon="icons/cdi16.png"
+ icon="icons/wizard/annotation.png"
id="org.jboss.tools.cdi.ui.wizard.NewQualifierCreationWizard"
name="Qualifier Annotation"
project="false">
@@ -198,7 +198,7 @@
<wizard
category="org.jboss.tools.cdi.ui"
class="org.jboss.tools.cdi.ui.wizard.NewStereotypeCreationWizard"
- icon="icons/cdi16.png"
+ icon="icons/wizard/annotation.png"
id="org.jboss.tools.cdi.ui.wizard.NewStereotypeCreationWizard"
name="Stereotype Annotation"
project="false">
@@ -213,7 +213,7 @@
<wizard
category="org.jboss.tools.cdi.ui"
class="org.jboss.tools.cdi.ui.wizard.NewScopeCreationWizard"
- icon="icons/cdi16.png"
+ icon="icons/wizard/annotation.png"
id="org.jboss.tools.cdi.ui.wizard.NewScopeCreationWizard"
name="Scope Annotation"
project="false">
@@ -228,7 +228,7 @@
<wizard
category="org.jboss.tools.cdi.ui"
class="org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingCreationWizard"
- icon="icons/cdi16.png"
+ icon="icons/wizard/annotation.png"
id="org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingCreationWizard"
name="Interceptor Binding Annotation"
project="false">
@@ -243,7 +243,7 @@
<wizard
category="org.jboss.tools.cdi.ui"
class="org.jboss.tools.cdi.ui.wizard.NewInterceptorCreationWizard"
- icon="icons/cdi16.png"
+ icon="icons/wizard/bean_class.png"
id="org.jboss.tools.cdi.ui.wizard.NewInterceptorCreationWizard"
name="Interceptor"
project="false">
@@ -258,7 +258,7 @@
<wizard
category="org.jboss.tools.cdi.ui"
class="org.jboss.tools.cdi.ui.wizard.NewDecoratorCreationWizard"
- icon="icons/cdi16.png"
+ icon="icons/wizard/bean_class.png"
id="org.jboss.tools.cdi.ui.wizard.NewDecoratorCreationWizard"
name="Decorator"
project="false">
@@ -273,7 +273,7 @@
<wizard
category="org.jboss.tools.cdi.ui"
class="org.jboss.tools.cdi.ui.wizard.NewBeanCreationWizard"
- icon="icons/cdi16.png"
+ icon="icons/wizard/bean_class.png"
id="org.jboss.tools.cdi.ui.wizard.NewBeanCreationWizard"
name="Bean"
project="false">
@@ -288,7 +288,7 @@
<wizard
category="org.jboss.tools.cdi.ui"
class="org.jboss.tools.cdi.ui.wizard.NewAnnotationLiteralCreationWizard"
- icon="icons/cdi16.png"
+ icon="icons/wizard/annotation.png"
id="org.jboss.tools.cdi.ui.wizard.NewAnnotationLiteralCreationWizard"
name="Annotation Literal"
project="false">
@@ -302,7 +302,7 @@
<wizard
name="%NewWizards.file"
- icon="icons/cdi16.png"
+ icon="icons/wizard/beans_xml.png"
category="org.jboss.tools.cdi.ui"
class="org.jboss.tools.cdi.ui.wizard.NewBeansXMLCreationWizard"
id="org.jboss.tools.cdi.ui.wizard.NewBeansXMLCreationWizard">
14 years, 6 months
JBoss Tools SVN: r34926 - in trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css: properties and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-09-21 09:26:05 -0400 (Wed, 21 Sep 2011)
New Revision: 34926
Modified:
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/dialog/tabs/TabQuickEditControl.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java
trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/QuickEditSection.java
Log:
https://issues.jboss.org/browse/JBIDE-9739 , selectionChanged(..) notification was fixed.
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/dialog/tabs/TabQuickEditControl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/dialog/tabs/TabQuickEditControl.java 2011-09-21 13:18:17 UTC (rev 34925)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/dialog/tabs/TabQuickEditControl.java 2011-09-21 13:26:05 UTC (rev 34926)
@@ -46,22 +46,20 @@
}
/**
- * Initialize method.s
+ * Adds content to the tab.
*/
private void addContent() {
-
- ArrayList<String> listKeys = new ArrayList<String>(getStyleAttributes()
- .keySet());
-
+ /*
+ * Called from QuickEditSection.setInput(..)
+ * StyleAttributes() should be already updated
+ */
+ ArrayList<String> listKeys = new ArrayList<String>(getStyleAttributes().keySet());
if (listKeys.size() == 0) {
Label label = new Label(this, SWT.CENTER);
label.setText(JstUIMessages.CSS_NO_EDITED_PROPERTIES);
}
-
Collections.sort(listKeys);
-
for (String key : listKeys) {
-
String value = getStyleAttributes().get(key);
if (value != null && value.length() > 0) {
addLabel(this, key + Constants.COLON);
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java 2011-09-21 13:18:17 UTC (rev 34925)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/CSSPropertyPage.java 2011-09-21 13:26:05 UTC (rev 34926)
@@ -95,9 +95,15 @@
//added by Maksim Areshkay as fix for https://issues.jboss.org/browse/JBIDE-8523
//here we should process only elements of StyleContainer or set selection to null(clean)
if(newSelectedObject==null||(newSelectedObject instanceof StyleContainer)){
- super.selectionChanged(part, selection);
selectedObject = newSelectedObject;
update();
+ /*
+ * https://issues.jboss.org/browse/JBIDE-9739
+ * {super} should be called after the selection has been updated.
+ * Because TabQuickEditControl's addContent() method uses
+ * getStyleAttributes() to fill in the tab content.
+ */
+ super.selectionChanged(part, selection);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/QuickEditSection.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/QuickEditSection.java 2011-09-21 13:18:17 UTC (rev 34925)
+++ trunk/jst/plugins/org.jboss.tools.jst.css/src/org/jboss/tools/jst/css/properties/QuickEditSection.java 2011-09-21 13:26:05 UTC (rev 34926)
@@ -31,6 +31,10 @@
@Override
public void setInput(IWorkbenchPart part, ISelection selection) {
+ /*
+ * Called after super.selectionChanged(..) from
+ * CSSPropertyPage.selectionChanged(..)
+ */
getSectionControl().update();
getTabComposite().layout(true, true);
super.setInput(part, selection);
14 years, 6 months
JBoss Tools SVN: r34925 - in trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test: suite and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2011-09-21 09:18:17 -0400 (Wed, 21 Sep 2011)
New Revision: 34925
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java
Log:
* refactoring
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java 2011-09-21 12:04:49 UTC (rev 34924)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ActivityModelingTest.java 2011-09-21 13:18:17 UTC (rev 34925)
@@ -105,10 +105,5 @@
bpel.addReply("reply", "DiscriminantResponse", "", new String[] {"client", "Discriminant", "calculateDiscriminant"});
}
-
- void openFile(String projectName, String... path) throws Exception {
- log.info("Opening file: " + path[path.length - 1] + " ...");
- pExplorer.openFile(projectName, path);
- }
}
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2011-09-21 12:04:49 UTC (rev 34924)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2011-09-21 13:18:17 UTC (rev 34925)
@@ -158,9 +158,6 @@
}
- void openFile(String projectName, String... path) throws Exception {
- log.info("Opening file: " + path[path.length - 1] + " ...");
- pExplorer.openFile(projectName, path);
- }
+
}
\ No newline at end of file
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java 2011-09-21 12:04:49 UTC (rev 34924)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java 2011-09-21 13:18:17 UTC (rev 34925)
@@ -106,10 +106,5 @@
bpel.addReply("Reply", "outputMessage", "", new String[] {"scopeProcess", "scopePT", "processRequest"});
}
-
- void openFile(String projectName, String... path) throws Exception {
- log.info("Opening file: " + path[path.length - 1] + " ...");
- pExplorer.openFile(projectName, path);
- }
}
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java 2011-09-21 12:04:49 UTC (rev 34924)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java 2011-09-21 13:18:17 UTC (rev 34925)
@@ -98,10 +98,4 @@
bpel.save();
}
-
- void openFile(String projectName, String... path) throws Exception {
- log.info("Opening file: " + path[path.length - 1] + " ...");
- pExplorer.openFile(projectName, path);
- }
-
}
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java 2011-09-21 12:04:49 UTC (rev 34924)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java 2011-09-21 13:18:17 UTC (rev 34925)
@@ -4,6 +4,7 @@
import org.jboss.tools.bpel.ui.bot.test.ActivityModelingTest;
import org.jboss.tools.bpel.ui.bot.test.AssignActivityTest;
+import org.jboss.tools.bpel.ui.bot.test.ToolingCompatibilityTest;
import org.jboss.tools.bpel.ui.bot.test.FaultModelingTest;
import org.jboss.tools.bpel.ui.bot.test.OdeDeployTest;
import org.jboss.tools.bpel.ui.bot.test.SimpleModelingTest;
@@ -17,6 +18,7 @@
import org.junit.runners.Suite.SuiteClasses;
@SuiteClasses({OdeDeployTest.class, WizardTest.class, ActivityModelingTest.class, AssignActivityTest.class, SimpleModelingTest.class, FaultModelingTest.class})
+//(a)SuiteClasses({ToolingCompatibilityTest.class})
@RunWith(RequirementAwareSuite.class)
public class BPELAllTest extends TestSuite {
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java 2011-09-21 12:04:49 UTC (rev 34924)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELTest.java 2011-09-21 13:18:17 UTC (rev 34925)
@@ -18,6 +18,7 @@
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.view.PackageExplorer;
import org.jboss.tools.ui.bot.ext.view.ProjectExplorer;
public class BPELTest extends SWTTestExt {
@@ -36,8 +37,7 @@
bot.sleep(TIME_5S, "BPEL All Tests Finished!");
}
-
-
+ protected PackageExplorer pExplorer = new PackageExplorer();
protected ProjectExplorer projExplorer = new ProjectExplorer(){
@Override
@@ -227,4 +227,9 @@
return out.length() == 0 ? null : out.toString();
}
+ protected void openFile(String projectName, String... path) throws Exception {
+ log.info("Opening file: " + path[path.length - 1] + " ...");
+ pExplorer.openFile(projectName, path);
+ }
+
}
14 years, 6 months
JBoss Tools SVN: r34924 - in trunk/forge/plugins: org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-09-21 08:04:49 -0400 (Wed, 21 Sep 2011)
New Revision: 34924
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeAnsiCommandFilter.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
Log:
JBIDE-9759
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeAnsiCommandFilter.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeAnsiCommandFilter.java 2011-09-21 07:54:11 UTC (rev 34923)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeAnsiCommandFilter.java 2011-09-21 12:04:49 UTC (rev 34924)
@@ -50,7 +50,9 @@
private boolean isAnsiEnd(char c) {
return c == 'G' ||
c == 'K' ||
- c == 'm';
+ c == 'm' ||
+ c == 'H' ||
+ c == 'J';
}
}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2011-09-21 07:54:11 UTC (rev 34923)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2011-09-21 12:04:49 UTC (rev 34924)
@@ -28,7 +28,9 @@
private static String BACKSPACE = new Character('\b').toString();
private static String UP_ARROW = new Character((char)16).toString();
private static String DOWN_ARROW = new Character((char)14).toString();
-
+ private static String LEFT_ARROW = new Character((char)2).toString();
+ private static String RIGHT_ARROW = new Character((char)6).toString();
+
private class RuntimeStopListener implements PropertyChangeListener {
@Override
public void propertyChange(PropertyChangeEvent evt) {
@@ -43,13 +45,15 @@
@Override
public void keyPressed(KeyEvent e) {
if (e.keyCode == SWT.BS) {
- handleBackspace();
+ runtime.sendInput(BACKSPACE);
} else if (e.keyCode == SWT.ARROW_UP) {
- handleArrowUp();
+ runtime.sendInput(UP_ARROW);
} else if (e.keyCode == SWT.ARROW_DOWN) {
- handleArrowDown();
- } else if (e.keyCode == SWT.F1) {
- handleF1Down();
+ runtime.sendInput(DOWN_ARROW);
+ } else if (e.keyCode == SWT.ARROW_LEFT) {
+ runtime.sendInput(LEFT_ARROW);
+ } else if (e.keyCode == SWT.ARROW_RIGHT) {
+ runtime.sendInput(RIGHT_ARROW);
}
}
@Override
@@ -81,7 +85,10 @@
private ForgeOutputListener outputListener;
private ForgeRuntime runtime;
private ForgeDocument document;
+ private StyleRange currentStyleRange = null;
+
+
public ForgeTextViewer(Composite parent, ForgeRuntime runtime) {
super(parent, SWT.WRAP | SWT.V_SCROLL | SWT.H_SCROLL);
this.runtime = runtime;
@@ -95,7 +102,7 @@
initOutputListener();
initStopListener();
}
-
+
private void initDocument() {
document = new ForgeDocument();
document.addDocumentListener(new DocumentListener());
@@ -166,38 +173,43 @@
e.doit = false;
}
- private void handleBackspace() {
- runtime.sendInput(BACKSPACE);
+ protected void handleVerifyKeyEvent(VerifyEvent e) {
+ if (e.keyCode == SWT.BS) {
+ runtime.sendInput(BACKSPACE);
+ e.doit = false;
+ } else if (e.keyCode == SWT.ARROW_UP) {
+ runtime.sendInput(UP_ARROW);
+ e.doit = false;
+ } else if (e.keyCode == SWT.ARROW_DOWN) {
+ runtime.sendInput(DOWN_ARROW);
+ e.doit = false;
+ } else if (e.keyCode == SWT.ARROW_LEFT) {
+ runtime.sendInput(LEFT_ARROW);
+ e.doit = false;
+ } else if (e.keyCode == SWT.ARROW_RIGHT) {
+ runtime.sendInput(RIGHT_ARROW);
+ e.doit = false;
+ }
}
-
- private void handleArrowUp() {
- runtime.sendInput(UP_ARROW);
- }
-
- private void handleArrowDown() {
- runtime.sendInput(DOWN_ARROW);
- }
-
- private void handleF1Down() {
- runtime.sendInput(new Character((char)31).toString() + "hidden command!\n");
- }
-
+
private void executeAnsiCommand(final String command) {
Display.getDefault().asyncExec(new Runnable() {
@Override
public void run() {
char c = command.charAt(command.length() - 1);
switch (c) {
- case 'G' : moveCursorAbsolute(command); break;
+ case 'G' : moveCursorAbsoluteInLine(command); break;
case 'K' : clearCurrentLine(command); break;
case 'm' : changeColor(command); break;
+ case 'H' : setCursorPosition(command); break;
+ case 'J' : clearCurrentScreenPage(command); break;
default : ForgeUIPlugin.log(new RuntimeException("Unhandled Ansi control sequence in ForgeTextViewer: "+ command));
}
}
});
}
- private void moveCursorAbsolute(final String command) {
+ private void moveCursorAbsoluteInLine(final String command) {
try {
int column = Integer.valueOf(command.substring(2, command.length() - 1));
int lineStart = document.getLineOffset(document.getLineOfOffset(getTextWidget().getCaretOffset()));
@@ -216,8 +228,6 @@
}
}
- private StyleRange currentStyleRange = null;
-
private void changeColor(String command) {
String str = command.substring(2, command.length() - 1);
Color newColor = null;
@@ -245,4 +255,28 @@
}
}
+ private void setCursorPosition(String command) {
+ String str = command.substring(2, command.length() - 1);
+ int i = str.indexOf(';');
+ int line = 0, column = 0;
+ if (i != -1) {
+ line = Integer.valueOf(str.substring(0, i));
+ column = Integer.valueOf(str.substring(i + 1));
+ } else if (str.length() > 0) {
+ line = Integer.valueOf(str);
+ }
+ StyledText textWidget = getTextWidget();
+ int offset = textWidget.getOffsetAtLine(line);
+ int maxColumn = textWidget.getLine(line).length();
+ offset += Math.min(maxColumn, column);
+ getTextWidget().setCaretOffset(offset);
+ }
+
+ private void clearCurrentScreenPage(String command) {
+ String str = command.substring(2, command.length() - 1);
+ if ("2".equals(str)) {
+ getDocument().set("");
+ }
+ }
+
}
14 years, 6 months
JBoss Tools SVN: r34923 - in trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test: validate and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-09-21 03:54:11 -0400 (Wed, 21 Sep 2011)
New Revision: 34923
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ComponentsValidator.java
trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ELExprValidator.java
Log:
Fixes for JBDS 5.0.0.M3
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java 2011-09-21 04:26:50 UTC (rev 34922)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java 2011-09-21 07:54:11 UTC (rev 34923)
@@ -10,6 +10,7 @@
import org.jboss.tools.seam.ui.bot.test.WARTests;
import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.parts.SWTBotBrowserExt;
import org.jboss.tools.ui.bot.ext.parts.SWTBotRadioExt;
@@ -41,6 +42,7 @@
@Test
@Category(WARTests.class)
public void testCheckSeamProjectWar(){
+ bot.sleep(Timing.time3S());
checkSeamProject(TestControl.TYPE_WAR);
}
@@ -54,6 +56,7 @@
@Test
@Category(EARTests.class)
public void testCheckSeamProjectEar(){
+ bot.sleep(Timing.time3S());
checkSeamProject(TestControl.TYPE_EAR);
}
@@ -87,7 +90,7 @@
problems.show();
SWTBotTreeItem[] errors = ProblemsView.getFilteredErrorsTreeItems(bot, null, null, null, null);
- assertNull("Errors in problem view.", errors);
+ assertTrue("Errors in problem view.", errors == null || errors.length == 0);
open.viewOpen(ActionItem.View.GeneralInternalWebBrowser.LABEL);
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ComponentsValidator.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ComponentsValidator.java 2011-09-21 04:26:50 UTC (rev 34922)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ComponentsValidator.java 2011-09-21 07:54:11 UTC (rev 34923)
@@ -37,8 +37,8 @@
private void testAddComponentProperty(String type) {
// open components.xml
- SWTBotEclipseEditor cEditor = projectExplorer.openFile(testProjectName + type,
- "Web Resources : WebContent", "WEB-INF", "components.xml").toTextEditor();
+ SWTBotEclipseEditor cEditor = packageExplorer.openFile(testProjectName + type,
+ "WebContent", "WEB-INF", "components.xml").toTextEditor();
// add non-existing property
@@ -86,7 +86,7 @@
problems.show();
sProblems = problems.getFilteredErrorsTreeItems(bot, "does not have a setter or a field",
"/" + testProjectName, "components.xml", "Seam Problem");
- assertTrue("Seam problem still exists.", sProblems == null);
+ assertTrue("Seam problem still exists.", sProblems == null || sProblems.length == 0);
cEditor.close();
aEditor.close();
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ELExprValidator.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ELExprValidator.java 2011-09-21 04:26:50 UTC (rev 34922)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ELExprValidator.java 2011-09-21 07:54:11 UTC (rev 34923)
@@ -1,13 +1,13 @@
package org.jboss.tools.seam.ui.bot.test.validate;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
-import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.seam.ui.bot.test.AbstractSeamTestBase;
import org.jboss.tools.seam.ui.bot.test.EARTests;
import org.jboss.tools.seam.ui.bot.test.TestControl;
import org.jboss.tools.seam.ui.bot.test.WARTests;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.view.ProblemsView;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,8 +29,8 @@
private void testELExpr(String type) {
- SWTBotEclipseEditor editor = projectExplorer.openFile(testProjectName + type,
- "Web Resources", "home.xhtml").toTextEditor();
+ SWTBotEclipseEditor editor = packageExplorer.openFile(testProjectName + type,
+ "WebContent", "home.xhtml").toTextEditor();
// add correct expression
int idx = 0;
@@ -45,9 +45,9 @@
SWTTestExt.util.waitForNonIgnoredJobs(60000);
// check that there is no problem
- SWTBotView pBotView = problems.show();
- SWTBotTreeItem[] sProblems = problems.getFilteredErrorsTreeItems(bot, "hasR",
- "/" + testProjectName, "home.xhtml", "JSF EL Problem");
+ problems.show();
+ SWTBotTreeItem[] sProblems = ProblemsView.getFilteredErrorsTreeItems(bot, "hasR",
+ "/" + testProjectName + type, "home.xhtml", "JSF EL Problem");
assertTrue("JSF-EL problem found.", ( (sProblems == null) || (sProblems.length == 0) ));
// add incorrect expression
@@ -56,11 +56,11 @@
SWTTestExt.util.waitForNonIgnoredJobs(60000);
// check that JSF EL Problem exists
- pBotView = problems.show();
- sProblems = problems.getFilteredErrorsTreeItems(bot, "hasR",
- "/" + testProjectName, "home.xhtml", "JSF EL Problem");
- assertTrue("No JSF-EL problem found.", ( (sProblems != null) && (sProblems.length > 0) ));
- assertTrue("More than oneJSF-EL problem found.", sProblems.length <= 1);
+ problems.show();
+ SWTBotTreeItem[] sWarnings = ProblemsView.getFilteredWarningsTreeItems(bot, "hasR",
+ "/" + testProjectName + type, "home.xhtml", "EL Knowledge Base Problem");
+ assertTrue("No JSF-EL problem found.", ( (sWarnings != null) && (sWarnings.length > 0) ));
+ assertTrue("More than oneJSF-EL problem found.", sWarnings.length <= 1);
editor.close();
14 years, 6 months
JBoss Tools SVN: r34922 - branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-09-21 00:26:50 -0400 (Wed, 21 Sep 2011)
New Revision: 34922
Modified:
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
Log:
fixed errors
Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2011-09-21 04:25:01 UTC (rev 34921)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2011-09-21 04:26:50 UTC (rev 34922)
@@ -248,7 +248,7 @@
</listitem>
<listitem>
<para>
- <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-1013">TEIIDDES-1013</ulink>: A bug existed where the RESTful properties of <property>REST-METHOD</proeprty> and <property>URI</proeprty> that are required for RESTful procedures required the names to be all upper-case. This caused errors when users would provide these properties but not all letters were upper-case. Resolving this issue has seen the modification of the <classname>ModelObjectAnnotationHelper</classname> and <classname>GenerateRestWarAction</classname> classes to check that the properties exist reguardless of the case-type used.
+ <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-1013">TEIIDDES-1013</ulink>: A bug existed where the RESTful properties of <property>REST-METHOD</property> and <property>URI</property> that are required for RESTful procedures required the names to be all upper-case. This caused errors when users would provide these properties but not all letters were upper-case. Resolving this issue has seen the modification of the <classname>ModelObjectAnnotationHelper</classname> and <classname>GenerateRestWarAction</classname> classes to check that the properties exist reguardless of the case-type used.
</para>
</listitem>
<!-- To be completed -->
14 years, 6 months
JBoss Tools SVN: r34921 - branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-09-21 00:25:01 -0400 (Wed, 21 Sep 2011)
New Revision: 34921
Modified:
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
Log:
updated for brew
Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-09-21 04:24:22 UTC (rev 34920)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 2011-09-21 04:25:01 UTC (rev 34921)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.1</edition>
- <pubsnumber>3</pubsnumber>
+ <pubsnumber>4</pubsnumber>
<abstract>
<para>
These release notes contain important information related to the JBoss Developer Studio. New features, known issues, resources, and other current issues are addressed here.
14 years, 6 months
JBoss Tools SVN: r34920 - branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-09-21 00:24:22 -0400 (Wed, 21 Sep 2011)
New Revision: 34920
Modified:
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
Log:
updated with new teiid designer bugs
Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2011-09-21 01:10:16 UTC (rev 34919)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2011-09-21 04:24:22 UTC (rev 34920)
@@ -228,11 +228,47 @@
<itemizedlist>
<listitem>
<para>
- <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-1021">TEIIDDES-1021</ulink>: When creating a new virtual procedure a user was requried to remember to insert prologue and postlogue code into the transformation editor. This allowed for common mistakes to occur when a user forgot to insert the correct code. For ease of use prologue and postlogue code is now inserted into the transformation editor automatically when creating a new virtual procedure. The change has reduced the amount of code required to be display on screen and created an improved user exerpeince.
+ <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-1032">TEIIDDES-1032</ulink>: An error in the code when a web service data source was created meant that the <property>Endpoint</property> would not be set. This was because the <property>Endpoint</property> property was incorrectly named as <property>WSUrl</property>. Correcting this error within the <filename>IWSProfileConstants.java</filename> file has fixed the issue.
</para>
</listitem>
<listitem>
<para>
+ <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-1026">TEIIDDES-1026</ulink>: A bug existed where only DBO schemas could be selected when importing from an SQL server using <guilabel>Import from JDBC</guilabel>. This meant that any other type of schemas in the server database could not be imported although they are supported by Teiid Designer. To correct the issue the code that asks for all the different schemas available in an SQL server database has been modified to allow for multiple types of schemas.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-1017">TEIIDDES-1017</ulink>: A new feature has been added that allows for a Teiid Source file to be imported through an import wizard called <guilabel>Metadata from Teiid Metadata File</guilabel>. Once a source file is imported a relational model is generated that contains standard file connector procedures and a virtual model is created or selected for use that contains the file functions required by the table. For further information see the Teiid Designer User Guide for this release.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-1016">TEIIDDES-1016</ulink>: Working towards the removal of the relationship metamodel, all non-essential user interface components have been removed and only the relationship diagram is now displayed. The relationship metamodel is being removed as it is no longer be used by Teiid or Modeshape.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-1013">TEIIDDES-1013</ulink>: A bug existed where the RESTful properties of <property>REST-METHOD</proeprty> and <property>URI</proeprty> that are required for RESTful procedures required the names to be all upper-case. This caused errors when users would provide these properties but not all letters were upper-case. Resolving this issue has seen the modification of the <classname>ModelObjectAnnotationHelper</classname> and <classname>GenerateRestWarAction</classname> classes to check that the properties exist reguardless of the case-type used.
+ </para>
+ </listitem>
+ <!-- To be completed -->
+ <!-- <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-992">TEIIDDES-992</ulink>: A new feature has been added that allows the use of <emphasis>Pushdown</emphasis> functions without Java programming.
+ </para>
+ </listitem> -->
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-990">TEIIDDES-990</ulink>: Previously generated RESTEasy WARs accepted only a Uniform Resourc e Identifier (URI) and XML parameters and produced only XML. JavaScript Object Notation (JSON) support as input and output has been added for this release and the URI for JSON methods contain <property>json</property> (for example, http://host:port/warname/modelname/json/pathinfo). To utilize XML instead, remove <property>json</property> from the path.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-982">TEIIDDES-982</ulink>: If a SOAP <property>EndPoint</property> was entered for a connection profile it would cause a connection erorr when exiting the dialog. The error occured because the key value for the <property>EndPoint</property> was incorrect and never added to the <property>TeiidDataSourceProperty</property> object, which meant the connection could not be referenced correctly. This issue has been corrected through the modification of the <classname>SOAPConnectionInfoProvider</classname> class to correctly contain the <property>EndPoint</property> value and add it to the <property>TeiidDataSourceProperty</property> object for later recall by the connection.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
<ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-981">TEIIDDES-981</ulink>: An enhancement has been made to the <guilabel>Preview Data</guilabel> action that asks if a user wants to enable the preview preference and if they wish to create a server (if one does not already exist). The <guilabel>Deploy</guilabel> action has also been updated to ask a user if they wish to create a server, if one does not already exist. These enhancements improve the user experience for Teiid Designer.
</para>
</listitem>
@@ -271,6 +307,11 @@
<ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-369">TEIIDDES-369</ulink>: A new feature has been added that places a green arrow beside any objects that are previewable by a user. The implementation of this new feature ensures that a user does not need to click an object to identify if performing the click action will do anything.
</para>
</listitem>
+ <listitem>
+ <para>
+ <ulink url="http://jira.jboss.com/jira/browse/TEIIDDES-332">TEIIDDES-332</ulink>: When creating a new virtual procedure a user was requried to remember to insert prologue and postlogue code into the transformation editor. This allowed for common mistakes to occur when a user forgot to insert the correct code. For ease of use prologue and postlogue code is now inserted into the transformation editor automatically when creating a new virtual procedure. The change has reduced the amount of code required to be display on screen and created an improved user exerpeince.
+ </para>
+ </listitem>
</itemizedlist>
</para>
</formalpara>
14 years, 6 months
JBoss Tools SVN: r34919 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui: src/org/jboss/tools/jst/web/ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-20 21:10:16 -0400 (Tue, 20 Sep 2011)
New Revision: 34919
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties
Log:
removed menu group Red Hat from popup menu on files in Project Explorer.
renamed it to JBoss Tools
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2011-09-21 00:57:49 UTC (rev 34918)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2011-09-21 01:10:16 UTC (rev 34919)
@@ -423,7 +423,6 @@
<enablement>
<or>
<instanceof value="org.jboss.tools.common.model.XModelObject"/>
- <instanceof value="org.eclipse.core.resources.IFile"/>
</or>
</enablement>
</actionProvider>
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2011-09-21 00:57:49 UTC (rev 34918)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2011-09-21 01:10:16 UTC (rev 34919)
@@ -64,7 +64,7 @@
WebAppFoldersFormLayoutData_MimeMappings=Mime Mappings
WebAppFoldersFormLayoutData_WebAppMimeMapping=WebAppMimeMapping
WebCompoundEditor_WebXMLEditor=Web XML Editor
-XActionProvider_CompanyName=Red Hat
+XActionProvider_CompanyName=JBoss Tools
AddTLDMarkerResolution_Name=Insert ''{0}'' tag library definition
NewXHTMLTemplatesWizardPage_0=Select XHTML Template
NewXHTMLTemplatesWizardPage_1=Select a template as initial content in theX HTML page.
14 years, 6 months