JBoss Tools SVN: r33425 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-01 17:24:42 -0400 (Mon, 01 Aug 2011)
New Revision: 33425
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-9440
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2011-08-01 21:20:41 UTC (rev 33424)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2011-08-01 21:24:42 UTC (rev 33425)
@@ -375,28 +375,30 @@
validateMethodsOfUnknownComponent(d);
}
IResource webContent = set.getViewsFolder();
- if(webContent instanceof IContainer) {
+ if(webContent instanceof IContainer && webContent.isAccessible()) {
validateAllPageXMLFiles((IContainer)webContent);
}
return OK_STATUS;
}
-
+
void validateAllPageXMLFiles(IContainer c) {
- IResource[] rs = null;
- try {
- rs = ((IContainer)c).members();
- } catch (CoreException e) {
- SeamCorePlugin.getDefault().logError(e);
- }
- for (int i = 0; i < rs.length; i++) {
- if(rs[i] instanceof IContainer) {
- validateAllPageXMLFiles((IContainer)rs[i]);
- } else if(rs[i] instanceof IFile) {
- validatePageXML((IFile)rs[i]);
+ if(c.isAccessible()) {
+ IResource[] rs = null;
+ try {
+ rs = c.members();
+ } catch (CoreException e) {
+ SeamCorePlugin.getDefault().logError(e);
+ return;
}
+ for (int i = 0; i < rs.length; i++) {
+ if(rs[i] instanceof IContainer) {
+ validateAllPageXMLFiles((IContainer)rs[i]);
+ } else if(rs[i] instanceof IFile) {
+ validatePageXML((IFile)rs[i]);
+ }
+ }
}
-
}
private void validateFactory(IPath sourceFilePath, Set<String> markedDuplicateFactoryNames) {
@@ -1054,7 +1056,7 @@
}
private void validatePageXML(IFile f) {
- if(f.getName().equals("pages.xml") || f.getName().endsWith(".page.xml")) {
+ if(f.isAccessible() && (f.getName().equals("pages.xml") || f.getName().endsWith(".page.xml"))) {
XModelObject object = EclipseResourceUtil.createObjectForResource(f);
if(object == null) return;
if(object.getModelEntity().getName().startsWith(SeamPagesConstants.ENT_FILE_SEAM_PAGE)) {
13 years, 7 months
JBoss Tools SVN: r33424 - trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-01 17:20:41 -0400 (Mon, 01 Aug 2011)
New Revision: 33424
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java
Log:
removed extra waitForIdle()
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2011-08-01 21:18:42 UTC (rev 33423)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2011-08-01 21:20:41 UTC (rev 33424)
@@ -15,7 +15,6 @@
* @throws CoreException
*/
public static void waitForValidation() throws CoreException{
- JobUtils.waitForIdle();
for (int i = 0; i < 50; i++) {
if(ValidatorManager.getStatus().equals(ValidatorManager.SLEEPING)) {
break;
13 years, 7 months
JBoss Tools SVN: r33423 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-08-01 17:18:42 -0400 (Mon, 01 Aug 2011)
New Revision: 33423
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-9440
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2011-08-01 21:10:20 UTC (rev 33422)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2011-08-01 21:18:42 UTC (rev 33423)
@@ -374,11 +374,11 @@
displaySubtask(SeamValidationMessages.VALIDATING_CLASS, new String[]{projectName, d.getClassName()});
validateMethodsOfUnknownComponent(d);
}
- IResource webContent = EclipseResourceUtil.getFirstWebContentResource(project);
+ IResource webContent = set.getViewsFolder();
if(webContent instanceof IContainer) {
validateAllPageXMLFiles((IContainer)webContent);
}
-
+
return OK_STATUS;
}
13 years, 7 months
JBoss Tools SVN: r33422 - in trunk/seam/tests/org.jboss.tools.seam.ui.test: projects/SeamConfigValidatorsTest and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-01 17:10:20 -0400 (Mon, 01 Aug 2011)
New Revision: 33422
Added:
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.classpath
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.project
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.jdt.core.prefs
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.component
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.jboss.tools.seam.core.prefs
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide3989Test.java
Log:
performance fix for seam configuration validation test:
1. Minimal project without optional resources
2. Unnecessary waitForIdele deleted
3. Markers are searched only for project resource because there is no reason to search seam configuration errors somewhere else
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.classpath
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.classpath (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.classpath 2011-08-01 21:10:20 UTC (rev 33422)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-6-openjdk">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.project
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.project (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.project 2011-08-01 21:10:20 UTC (rev 33422)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>SeamConfigValidatorsTest</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.seam.core.seambuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ <nature>org.jboss.tools.jsf.jsfnature</nature>
+ <nature>org.jboss.tools.seam.core.seamnature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.jdt.core.prefs 2011-08-01 21:10:20 UTC (rev 33422)
@@ -0,0 +1,8 @@
+#Mon Aug 01 11:38:21 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.component 2011-08-01 21:10:20 UTC (rev 33422)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="SeamConfigValidatorsTest">
+ <wb-resource deploy-path="/" source-path="/WebContent"/>
+ <wb-resource deploy-path="/WEB-INF/dev" source-path="/src/hot"/>
+ <property name="context-root" value="SeamConfigValidatorsTest"/>
+ <property name="java-output-path" value="/SeamConfigValidatorsTest/build/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml 2011-08-01 21:10:20 UTC (rev 33422)
@@ -0,0 +1,7 @@
+<root>
+ <facet id="jst.jsf">
+ <node name="libprov">
+ <attribute name="provider-id" value="jsf-no-op-library-provider"/>
+ </node>
+ </facet>
+</root>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.xml 2011-08-01 21:10:20 UTC (rev 33422)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 5.1 Runtime"/>
+ <fixed facet="jst.web"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="java"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="jst.jsf" version="1.2"/>
+ <installed facet="jst.seam" version="2.2"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+ <installed facet="java" version="1.6"/>
+</faceted-project>
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.jboss.tools.seam.core.prefs
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.jboss.tools.seam.core.prefs (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.jboss.tools.seam.core.prefs 2011-08-01 21:10:20 UTC (rev 33422)
@@ -0,0 +1,15 @@
+#Mon Aug 01 11:33:26 PDT 2011
+action.package=org.domain.seamconfigvalidatorstest.session
+action.sources=/SeamConfigValidatorsTest/src/hot
+eclipse.preferences.version=1
+model.package=org.domain.seamconfigvalidatorstest.entity
+model.sources=/SeamConfigValidatorsTest/src/main
+seam.project.connection.profile=DefaultDS
+seam.project.deployment.type=war
+seam.project.settings.version=1.1
+seam.project.web.root.folder=/SeamConfigValidatorsTest
+seam.runtime.name=Unknown
+seam.test.creating=false
+seam.test.project=SeamConfigValidatorsTest-test
+test.package=org.domain.seamconfigvalidatorstest.test
+test.sources=/SeamConfigValidatorsTest-test/test-src
Property changes on: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/SeamConfigValidatorsTest/.settings/org.jboss.tools.seam.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide3989Test.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide3989Test.java 2011-08-01 18:59:35 UTC (rev 33421)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/jbide/JBide3989Test.java 2011-08-01 21:10:20 UTC (rev 33422)
@@ -38,7 +38,7 @@
public class JBide3989Test extends TestCase {
private IProject project;
- private static final String PROJECT_NAME = "TestSeamELContentAssist";
+ private static final String PROJECT_NAME = "SeamConfigValidatorsTest";
private boolean makeCopy = true;
public static Test suite() {
@@ -47,14 +47,11 @@
@Override
protected void setUp() throws Exception {
- super.setUp();
TestProjectProvider provider = new TestProjectProvider(
"org.jboss.tools.seam.ui.test", null, PROJECT_NAME, makeCopy);
project = provider.getProject();
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- JobUtils.waitForIdle();
- ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
- seamProject.setRuntimeName("UNKNOWN");
+// ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
+// seamProject.setRuntimeName("UNKNOWN");
ValidatorManager.addProjectBuildValidationSupport(project);
// JBIDE-4832 - call SeamProjectPropertyValidator manually
project.build(IncrementalProjectBuilder.FULL_BUILD,
@@ -64,19 +61,17 @@
}
@Override
- protected void tearDown() throws Exception {
- JobUtils.waitForIdle();
- boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ protected void tearDown() {
try {
- project.delete(true, true, null);
- } finally {
- ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ project.delete(false, true, null);
+ } catch (CoreException e) {
+ e.printStackTrace();
}
}
public void testJBide3989() throws CoreException {
IMarker[] markers = project.findMarkers(IMarker.PROBLEM, true,
- IResource.DEPTH_INFINITE);
+ IResource.DEPTH_ZERO);
boolean found1 = false;
boolean found2 = false;
for (int i = 0; i < markers.length; i++) {
@@ -87,8 +82,7 @@
IMarkerResolution resolution = resolutions[j];
if (resolution instanceof SeamRuntimeMarkerResolution) {
found1 = true;
- }
- if (resolution instanceof AddNewSeamRuntimeMarkerResolution) {
+ } else if (resolution instanceof AddNewSeamRuntimeMarkerResolution) {
found2 = true;
}
}
13 years, 7 months
JBoss Tools SVN: r33421 - in trunk/forge/plugins: org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-01 14:59:35 -0400 (Mon, 01 Aug 2011)
New Revision: 33421
Added:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeOutputFilter.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/ForgeCommandListHandler.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/dialog/
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/dialog/ForgeCommandListDialog.java
Modified:
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeHiddenOutputFilter.java
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java
trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeRuntime.java
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandTriggeredAction.java
trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF
trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/Console.java
trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java
Log:
initial try-out of generating a popup with forge commands when issuing Cmd+4
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeHiddenOutputFilter.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeHiddenOutputFilter.java 2011-08-01 18:28:45 UTC (rev 33420)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeHiddenOutputFilter.java 2011-08-01 18:59:35 UTC (rev 33421)
@@ -1,6 +1,6 @@
package org.jboss.tools.forge.core.io;
-public class ForgeHiddenOutputFilter implements ForgeOutputListener {
+public abstract class ForgeHiddenOutputFilter implements ForgeOutputFilter {
private ForgeOutputListener target = null;
private boolean hidden = false;
@@ -8,6 +8,8 @@
private StringBuffer targetBuffer = new StringBuffer();
private StringBuffer escapeSequence = new StringBuffer();
+ public ForgeHiddenOutputFilter() {}
+
public ForgeHiddenOutputFilter(ForgeOutputListener target) {
this.target = target;
}
@@ -43,12 +45,14 @@
} else if (c == '%') {
if (escapeSequence.length() == 2) {
if (hidden) {
- handleHiddenOutput(hiddenBuffer);
+ handleFilteredString(hiddenBuffer.toString());
hiddenBuffer.setLength(0);
} else {
String out = targetBuffer.toString();
targetBuffer.setLength(0);
- target.outputAvailable(out);
+ if (target != null) {
+ target.outputAvailable(out);
+ }
}
escapeSequence.setLength(0);
hidden = !hidden;
@@ -78,22 +82,11 @@
if (hiddenBuffer.length() == 0 && targetBuffer.length() != 0) {
String out = targetBuffer.toString();
targetBuffer.setLength(0);
- target.outputAvailable(out);
+ if (target != null) {
+ target.outputAvailable(out);
+ }
}
}
- private void handleHiddenOutput(StringBuffer output) {
- System.out.println("handleHiddenOutput : " + output.toString());
- }
-
- private void appendToTargetBuffer(StringBuffer buffer) {
- System.out.println("appendToTargetBuffer : " + buffer);
- targetBuffer.append(buffer);
- }
-
- private void appendToHiddenBuffer(StringBuffer buffer) {
- System.out.println("appendToHiddenBuffer : " + buffer);
- }
-
}
Added: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeOutputFilter.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeOutputFilter.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/io/ForgeOutputFilter.java 2011-08-01 18:59:35 UTC (rev 33421)
@@ -0,0 +1,7 @@
+package org.jboss.tools.forge.core.io;
+
+public interface ForgeOutputFilter extends ForgeOutputListener {
+
+ void handleFilteredString(String str);
+
+}
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java 2011-08-01 18:28:45 UTC (rev 33420)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java 2011-08-01 18:59:35 UTC (rev 33421)
@@ -17,6 +17,7 @@
import org.eclipse.debug.core.model.IStreamMonitor;
import org.eclipse.debug.core.model.IStreamsProxy;
import org.jboss.tools.forge.core.ForgeCorePlugin;
+import org.jboss.tools.forge.core.io.ForgeHiddenOutputFilter;
import org.jboss.tools.forge.core.io.ForgeOutputListener;
public abstract class ForgeAbstractRuntime implements ForgeRuntime {
@@ -25,6 +26,7 @@
private String state = STATE_NOT_RUNNING;
private final TerminateListener terminateListener = new TerminateListener();
private MasterOutputListener masterOutputListener = new MasterOutputListener();
+ private CommandResultListener commandResultListener = new CommandResultListener();
private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
private List<ForgeOutputListener> outputListeners = new ArrayList<ForgeOutputListener>();
@@ -85,6 +87,37 @@
}
}
+ public String sendCommand(String str) {
+ String result = null;
+ if (process != null && !process.isTerminated()) {
+ IStreamsProxy streamsProxy = process.getStreamsProxy();
+ if (streamsProxy != null) {
+ IStreamMonitor streamMonitor = streamsProxy.getOutputStreamMonitor();
+ if (streamMonitor != null) {
+ commandResultListener.command = str + '\n';
+ streamMonitor.removeListener(masterOutputListener);
+ streamMonitor.addListener(commandResultListener);
+ try {
+ streamsProxy.write(new Character((char)31).toString() + str + '\n');
+ } catch (IOException e) {
+ ForgeCorePlugin.log(e);
+ }
+ try {
+ while (commandResultListener.result == null) {
+ Thread.sleep(100);
+ }
+ } catch (InterruptedException e) {}
+ result = commandResultListener.result;
+ commandResultListener.result = null;
+ commandResultListener.command = null;
+ streamMonitor.removeListener(commandResultListener);
+ streamMonitor.addListener(masterOutputListener);
+ }
+ }
+ }
+ return result;
+ }
+
public void sendInput(String str) {
if (process != null && !process.isTerminated()) {
IStreamsProxy streamProxy = process.getStreamsProxy();
@@ -166,6 +199,21 @@
}
}
+ private class CommandResultListener extends ForgeHiddenOutputFilter implements IStreamListener {
+ String result = null;
+ String command = null;
+ @Override
+ public void streamAppended(String text, IStreamMonitor monitor) {
+ outputAvailable(text);
+ }
+ @Override
+ public void handleFilteredString(String str) {
+ if (!str.endsWith(command)) {
+ result = str;
+ }
+ }
+ }
+
private class TerminateListener implements IDebugEventSetListener {
@Override
public void handleDebugEvents(DebugEvent[] events) {
Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeRuntime.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeRuntime.java 2011-08-01 18:28:45 UTC (rev 33420)
+++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeRuntime.java 2011-08-01 18:59:35 UTC (rev 33421)
@@ -17,10 +17,12 @@
String getLocation();
String getType();
String getState();
+
void start(IProgressMonitor progressMonitor);
void stop(IProgressMonitor progressMonitor);
void sendInput(String str);
+ String sendCommand(String str);
void addOutputListener(ForgeOutputListener outputListener);
void removeOutputListener(ForgeOutputListener outputListener);
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF 2011-08-01 18:28:45 UTC (rev 33420)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/META-INF/MANIFEST.MF 2011-08-01 18:59:35 UTC (rev 33421)
@@ -14,6 +14,7 @@
javax.inject,
org.jboss.forge,
org.jboss.forge.shell,
+ org.jboss.forge.shell.command,
org.jboss.forge.shell.events,
org.jboss.forge.shell.plugins,
org.jboss.forge.shell.spi
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandTriggeredAction.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandTriggeredAction.java 2011-08-01 18:28:45 UTC (rev 33420)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/src/org/jboss/tools/forge/runtime/ext/MetaCommandTriggeredAction.java 2011-08-01 18:59:35 UTC (rev 33421)
@@ -7,6 +7,7 @@
import javax.inject.Inject;
import org.jboss.forge.shell.Shell;
+import org.jboss.forge.shell.command.PluginRegistry;
import org.jboss.forge.shell.spi.TriggeredAction;
public class MetaCommandTriggeredAction implements TriggeredAction {
@@ -14,6 +15,8 @@
private static final String ESCAPE = new String(new char[] { 27, '[', '%' });
@Inject Shell shell;
+
+ @Inject PluginRegistry registry;
@Override
public ActionListener getListener() {
@@ -33,8 +36,18 @@
}
private void handleHiddenCommand(String text) {
- shell.print(ESCAPE + "handling hidden command : " + text + ESCAPE);
+ if ("command-list-query".equals(text)) {
+ shell.print(ESCAPE + "command-list-answer: " + getCommandList() + ESCAPE);
+ }
}
+
+ private String getCommandList() {
+ StringBuffer resultBuffer = new StringBuffer();
+ for (String name : registry.getPlugins().keySet()) {
+ resultBuffer.append(name).append(" ");
+ }
+ return resultBuffer.toString();
+ }
@Override
public char getTrigger() {
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-08-01 18:28:45 UTC (rev 33420)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/plugin.xml 2011-08-01 18:59:35 UTC (rev 33421)
@@ -57,5 +57,21 @@
id="org.jboss.tools.forge.runtimes">
</page>
</extension>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ categoryId="org.eclipse.ui.category.window"
+ defaultHandler="org.jboss.tools.forge.ui.commands.ForgeCommandListHandler"
+ description="Quickly access the list of Forge commands"
+ id="org.jboss.tools.forge.ui.commandList"
+ name="Forge Command List"/>
+ </extension>
+ <extension
+ point="org.eclipse.ui.bindings">
+ <key
+ commandId="org.jboss.tools.forge.ui.commandList"
+ sequence="M1+4"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" />
+ </extension>
</plugin>
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/ForgeCommandListHandler.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/ForgeCommandListHandler.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/ForgeCommandListHandler.java 2011-08-01 18:59:35 UTC (rev 33421)
@@ -0,0 +1,37 @@
+package org.jboss.tools.forge.ui.commands;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.jboss.tools.forge.core.process.ForgeRuntime;
+import org.jboss.tools.forge.ui.dialog.ForgeCommandListDialog;
+import org.jboss.tools.forge.ui.part.ConsoleView;
+
+public class ForgeCommandListHandler extends AbstractHandler {
+
+ public Object execute(ExecutionEvent executionEvent) {
+
+ IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(executionEvent);
+ if (window == null) {
+ return null;
+ }
+ IViewPart part = window.getActivePage().findView(ConsoleView.ID);
+ if (part == null || !(part instanceof ConsoleView)) {
+ return null;
+ }
+
+ ForgeRuntime runtime = ((ConsoleView)part).getRuntime();
+ if (runtime == null || !(ForgeRuntime.STATE_RUNNING.equals(runtime.getState()))) {
+ return null;
+ }
+
+ String result = runtime.sendCommand("command-list-query");
+
+ new ForgeCommandListDialog(window, result).open();
+
+ return null;
+ }
+
+}
\ No newline at end of file
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/Console.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/Console.java 2011-08-01 18:28:45 UTC (rev 33420)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/Console.java 2011-08-01 18:59:35 UTC (rev 33421)
@@ -61,7 +61,12 @@
appendString(output);
}
};
- outputListener = new ForgeHiddenOutputFilter(target);
+ outputListener = new ForgeHiddenOutputFilter(target) {
+ @Override
+ public void handleFilteredString(String str) {
+ System.out.println("handleHiddenOutput : " + str);
+ }
+ };
runtime.addOutputListener(outputListener);
}
Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/dialog/ForgeCommandListDialog.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/dialog/ForgeCommandListDialog.java (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/dialog/ForgeCommandListDialog.java 2011-08-01 18:59:35 UTC (rev 33421)
@@ -0,0 +1,50 @@
+package org.jboss.tools.forge.ui.dialog;
+
+import java.util.SortedSet;
+import java.util.StringTokenizer;
+import java.util.TreeSet;
+
+import org.eclipse.jface.dialogs.PopupDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.ui.IWorkbenchWindow;
+
+public class ForgeCommandListDialog extends PopupDialog {
+
+ private SortedSet<String> commandSet = new TreeSet<String>();
+
+ public ForgeCommandListDialog(IWorkbenchWindow window, String commands) {
+ super(window.getShell(),
+ SWT.RESIZE,
+ true,
+ true, // persist size
+ false, // but not location
+ true,
+ true,
+ "Select the command you want Forge to execute",
+ null);
+ StringTokenizer tokenizer = new StringTokenizer(commands);
+ if (tokenizer.hasMoreTokens()) {
+ String first = tokenizer.nextToken();
+ if ("command-list-answer:".equals(first)) {
+ while (tokenizer.hasMoreTokens()) {
+ commandSet.add(tokenizer.nextToken());
+ }
+ }
+ }
+ }
+
+ protected Control createDialogArea(Composite parent) {
+ Composite result = (Composite)super.createDialogArea(parent);
+ result.setLayout(new FillLayout());
+ List list = new List(result, SWT.SINGLE);
+ for (String command : commandSet) {
+ list.add(command);
+ }
+ return result;
+ }
+
+}
Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java 2011-08-01 18:28:45 UTC (rev 33420)
+++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java 2011-08-01 18:59:35 UTC (rev 33421)
@@ -21,6 +21,8 @@
import org.jboss.tools.forge.ui.console.ConsolePage;
public class ConsoleView extends ViewPart implements PropertyChangeListener {
+
+ public static final String ID = "org.jboss.tools.forge.console";
private static final String NOT_RUNNING_MESSAGE = "Forge is not running.";
private static final String STARTING_MESSAGE = "Please wait while Forge is starting";
@@ -193,5 +195,9 @@
private Display getDisplay() {
return getViewSite().getPage().getWorkbenchWindow().getShell().getDisplay();
}
+
+ public ForgeRuntime getRuntime() {
+ return runtime;
+ }
}
13 years, 7 months
JBoss Tools SVN: r33420 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-01 14:28:45 -0400 (Mon, 01 Aug 2011)
New Revision: 33420
Removed:
trunk/thirdparty/
Log:
empty folder, no longer needed
13 years, 7 months
JBoss Tools SVN: r33419 - in trunk/requirements: jbossas-4.2.3.GA and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-01 14:15:05 -0400 (Mon, 01 Aug 2011)
New Revision: 33419
Added:
trunk/requirements/jbossas-4.2.3.GA/
trunk/requirements/jbossas-4.2.3.GA/build.properties
Log:
Created separated jbossas-4.2.3.GA requirement to use in seam.ui.tests
Added: trunk/requirements/jbossas-4.2.3.GA/build.properties
===================================================================
--- trunk/requirements/jbossas-4.2.3.GA/build.properties (rev 0)
+++ trunk/requirements/jbossas-4.2.3.GA/build.properties 2011-08-01 18:15:05 UTC (rev 33419)
@@ -0,0 +1,6 @@
+# see also ../seamfp/build.properties; use latest noauth zip here
+jbossas423ga.build.uri=http://repository.jboss.org/sourceforge
+build.uri=${jbossas423ga.build.uri}
+build.archive=jboss-4.2.3.GA.zip
+md5=d1ded1cc876733fec96b5e2934c81220
+
13 years, 7 months
JBoss Tools SVN: r33417 - trunk/build/results.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-01 14:13:01 -0400 (Mon, 01 Aug 2011)
New Revision: 33417
Modified:
trunk/build/results/.gitignore
Log:
.gitignore file
Modified: trunk/build/results/.gitignore
===================================================================
--- trunk/build/results/.gitignore 2011-08-01 15:08:28 UTC (rev 33416)
+++ trunk/build/results/.gitignore 2011-08-01 18:13:01 UTC (rev 33417)
@@ -1,2 +1,3 @@
*.out.*
zips
+buildResults.html
13 years, 7 months
JBoss Tools SVN: r33416 - in workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite: features and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-08-01 11:08:28 -0400 (Mon, 01 Aug 2011)
New Revision: 33416
Added:
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/features/org.jboss.tools.as.sourcelookup.feature_1.0.0.201108011707.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.core_1.0.0.201108011707.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.ui_1.0.0.201108011707.jar
Removed:
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/features/org.jboss.tools.as.sourcelookup.feature_1.0.0.201108011616.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.core_1.0.0.201108011616.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.ui_1.0.0.201108011616.jar
Modified:
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/artifacts.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/content.jar
workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/site.xml
Log:
JBIDE-9309 Easily adding full JBoss AS source
Modified: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/artifacts.jar
===================================================================
(Binary files differ)
Modified: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/content.jar
===================================================================
(Binary files differ)
Deleted: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/features/org.jboss.tools.as.sourcelookup.feature_1.0.0.201108011616.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/features/org.jboss.tools.as.sourcelookup.feature_1.0.0.201108011707.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/features/org.jboss.tools.as.sourcelookup.feature_1.0.0.201108011707.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.core_1.0.0.201108011616.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.core_1.0.0.201108011707.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.core_1.0.0.201108011707.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.ui_1.0.0.201108011616.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.ui_1.0.0.201108011707.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/plugins/org.jboss.tools.as.sourcelookup.ui_1.0.0.201108011707.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/site.xml
===================================================================
--- workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/site.xml 2011-08-01 14:40:26 UTC (rev 33415)
+++ workspace/snjeza/org.jboss.tools.as.sourcelookup.updatesite/site.xml 2011-08-01 15:08:28 UTC (rev 33416)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.jboss.tools.as.sourcelookup.feature_1.0.0.201108011616.jar" id="org.jboss.tools.as.sourcelookup.feature" version="1.0.0.201108011616">
+ <feature url="features/org.jboss.tools.as.sourcelookup.feature_1.0.0.201108011707.jar" id="org.jboss.tools.as.sourcelookup.feature" version="1.0.0.201108011707">
<category name="org.jboss.tools.as.sourcelookup"/>
</feature>
<category-def name="org.jboss.tools.as.sourcelookup" label="JBoss Tools Source Lookup"/>
13 years, 7 months