JBoss Tools SVN: r40577 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-27 16:04:09 -0400 (Fri, 27 Apr 2012)
New Revision: 40577
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
Log:
JBIDE-11510
https://issues.jboss.org/browse/JBIDE-11510
addition to case #{a[|]}.
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-04-27 18:18:17 UTC (rev 40576)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-04-27 20:04:09 UTC (rev 40577)
@@ -695,7 +695,7 @@
? ((ELPropertyInvocation)expr).getName()
: (expr instanceof ELMethodInvocation)
? ((ELMethodInvocation)expr).getName()
- : (expr instanceof ELArgumentInvocation)
+ : (expr instanceof ELArgumentInvocation && ((ELArgumentInvocation)expr).getArgument().getArgument() != null)
? ((ELArgumentInvocation)expr).getArgument().getArgument().getFirstToken()
: null;
String name = lt != null ? lt.getText() : ""; // token.getText(); //$NON-NLS-1$
@@ -1039,6 +1039,7 @@
String filter = expr.getMemberName();
boolean bSurroundWithQuotes = false;
+ boolean closeQuotes = false;
if(filter == null) {
filter = ""; //$NON-NLS-1$
bSurroundWithQuotes = true;
@@ -1047,9 +1048,11 @@
|| (filter.endsWith("'") || filter.endsWith("\""))) { //$NON-NLS-1$ //$NON-NLS-2$
if (filter.startsWith("'") || filter.startsWith("\"")) {
filter = filter.length() == 1 ? "" : filter.substring(1); //$NON-NLS-1$
+ closeQuotes = true;
}
if (filter.endsWith("'") || filter.endsWith("\"")) {
- filter = filter.length() == 1 ? "" : filter.substring(0, filter.length() - 1); //$NON-NLS-1$
+ filter = filter.length() == 1 ? "" : filter.substring(0, filter.length() - 1); //$NON-NLS-1$
+ closeQuotes = false;
}
} else {
//Value is set as expression itself, we cannot compute it
@@ -1107,8 +1110,11 @@
String replacementString = proposal.getPresentation().substring(filter.length());
if (bSurroundWithQuotes) {
- replacementString = "'" + replacementString; //$NON-NLS-1$ //$NON-NLS-2$
+ replacementString = "'" + replacementString + "'"; //$NON-NLS-1$ //$NON-NLS-2$
+ } else if(closeQuotes) {
+ replacementString = replacementString + "'"; //$NON-NLS-1$
}
+
kbProposal.setReplacementString(replacementString);
kbProposal.setLabel(proposal.getPresentationDisplayName());
12 years, 8 months
JBoss Tools SVN: r40576 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-27 14:18:17 -0400 (Fri, 27 Apr 2012)
New Revision: 40576
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ContextValidationHelper.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java
Log:
JBIDE-11682
https://issues.jboss.org/browse/JBIDE-11682
Do not validate derived resources.
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ContextValidationHelper.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ContextValidationHelper.java 2012-04-27 18:07:30 UTC (rev 40575)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ContextValidationHelper.java 2012-04-27 18:18:17 UTC (rev 40576)
@@ -81,6 +81,9 @@
public void registerResource(IResource resource) {
if(resource instanceof IFile) {
IFile file = (IFile)resource;
+ if(file.isDerived(IResource.CHECK_ANCESTORS)) {
+ return;
+ }
if(validationContextManager == null) {
validationContextManager = new ValidationContext(file.getProject());
} else if(validationContextManager.isObsolete()) {
@@ -104,6 +107,7 @@
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
Set<IProject> projects = getAllProjects();
for (int i = 0; i < uris.length; i++) {
+ if(uris[i].endsWith(".jar") || uris[i].endsWith(".classpath")) continue;
IFile currentFile = root.getFile(new Path(uris[i]));
if(projects.contains(currentFile.getProject())
&& !currentFile.isDerived(IResource.CHECK_ANCESTORS)) {
@@ -119,6 +123,16 @@
return result;
}
+ public boolean isClasspathAffected() {
+ String[] uris = getURIs();
+ for (String uri: uris) {
+ if(uri.endsWith(".jar") || uri.endsWith(".classpath")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public Set<IFile> getProjectSetRegisteredFiles() {
Set<IFile> result = new HashSet<IFile>();
Set<IFile> files = getValidationContextManager().getRegisteredFiles();
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java 2012-04-27 18:07:30 UTC (rev 40575)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java 2012-04-27 18:18:17 UTC (rev 40576)
@@ -77,7 +77,7 @@
try {
validationContextManager.clearValidatedProjectsList();
Set<IFile> changedFiles = validationHelper.getChangedFiles();
- if(!changedFiles.isEmpty() || validationHelper.getURIs().length > 0) {
+ if((!validationHelper.isClasspathAffected() && (!changedFiles.isEmpty() || validationHelper.getURIs().length > 0))) {
status = validate(changedFiles, validationHelper, reporter, rootProjects);
} else if(!validationContextManager.getRegisteredFiles().isEmpty()) {
validationContextManager.clearAllResourceLinks(rootProjects);
12 years, 8 months
JBoss Tools SVN: r40575 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-27 14:07:30 -0400 (Fri, 27 Apr 2012)
New Revision: 40575
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java
Log:
JBIDE-11682
https://issues.jboss.org/browse/JBIDE-11682
Do not search in derived resources.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java 2012-04-27 15:27:24 UTC (rev 40574)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/refactoring/RefactorSearcher.java 2012-04-27 18:07:30 UTC (rev 40575)
@@ -292,6 +292,9 @@
}
protected void searchInCach(IFile file){
+ if(file == null || !file.isAccessible() || file.isDerived(IResource.CHECK_ANCESTORS)) {
+ return;
+ }
ELResolver[] resolvers = ELResolverFactoryManager.getInstance().getResolvers(file);
ELContext context = PageContextFactory.createPageContext(file);
12 years, 8 months
JBoss Tools SVN: r40574 - in trunk/tests/tests/org.jboss.tools.tests.tests: META-INF and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-04-27 11:27:24 -0400 (Fri, 27 Apr 2012)
New Revision: 40574
Added:
trunk/tests/tests/org.jboss.tools.tests.tests/projects/
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.classpath
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.project
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/.jsdtscope
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.jdt.core.prefs
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.common.component
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/WebContent/
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/WebContent/META-INF/
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/WebContent/META-INF/MANIFEST.MF
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/WebContent/WEB-INF/
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/WebContent/WEB-INF/lib/
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/WebContent/WEB-INF/web.xml
trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/src/
Modified:
trunk/tests/tests/org.jboss.tools.tests.tests/META-INF/MANIFEST.MF
trunk/tests/tests/org.jboss.tools.tests.tests/src/org/jboss/tools/tests/tests/AllTests.java
trunk/tests/tests/org.jboss.tools.tests.tests/src/org/jboss/tools/tests/tests/UtilsTest.java
Log:
JBIDE-11600
Implement a meaningful Test for tests/ module, instead of org.jboss.tools.tests.tests.UtilsTest
The JUnit Test is added for test component
Modified: trunk/tests/tests/org.jboss.tools.tests.tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/META-INF/MANIFEST.MF 2012-04-27 14:32:00 UTC (rev 40573)
+++ trunk/tests/tests/org.jboss.tools.tests.tests/META-INF/MANIFEST.MF 2012-04-27 15:27:24 UTC (rev 40574)
@@ -5,4 +5,8 @@
Bundle-Version: 3.2.0.qualifier
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.junit
+Require-Bundle: org.junit,
+ org.jboss.tools.tests,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.wst.validation
Added: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.classpath
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.classpath (rev 0)
+++ trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.classpath 2012-04-27 15:27:24 UTC (rev 40574)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-6-sun-1.6.0.26">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss EAP 6.0 Runtime">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.web"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Property changes on: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.project
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.project (rev 0)
+++ trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.project 2012-04-27 15:27:24 UTC (rev 40574)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>DynamicWebProject</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</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.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/.jsdtscope
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/.jsdtscope (rev 0)
+++ trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/.jsdtscope 2012-04-27 15:27:24 UTC (rev 40574)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.jdt.core.prefs 2012-04-27 15:27:24 UTC (rev 40574)
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.common.component 2012-04-27 15:27:24 UTC (rev 40574)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="DynamicWebProject">
+ <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <property name="context-root" value="DynamicWebProject"/>
+ <property name="java-output-path" value="/DynamicWebProject/build/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-04-27 15:27:24 UTC (rev 40574)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss EAP 6.0 Runtime"/>
+ <fixed facet="java"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="jst.web"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="jst.web" version="3.0"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Property changes on: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-04-27 15:27:24 UTC (rev 40574)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-04-27 15:27:24 UTC (rev 40574)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/WebContent/META-INF/MANIFEST.MF 2012-04-27 15:27:24 UTC (rev 40574)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/WebContent/WEB-INF/web.xml 2012-04-27 15:27:24 UTC (rev 40574)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+ <display-name>DynamicWebProject</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
Property changes on: trunk/tests/tests/org.jboss.tools.tests.tests/projects/DynamicWebProject/WebContent/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/tests/tests/org.jboss.tools.tests.tests/src/org/jboss/tools/tests/tests/AllTests.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/src/org/jboss/tools/tests/tests/AllTests.java 2012-04-27 14:32:00 UTC (rev 40573)
+++ trunk/tests/tests/org.jboss.tools.tests.tests/src/org/jboss/tools/tests/tests/AllTests.java 2012-04-27 15:27:24 UTC (rev 40574)
@@ -9,5 +9,4 @@
UtilsTest.class
})
public class AllTests {
-
}
Modified: trunk/tests/tests/org.jboss.tools.tests.tests/src/org/jboss/tools/tests/tests/UtilsTest.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.tests/src/org/jboss/tools/tests/tests/UtilsTest.java 2012-04-27 14:32:00 UTC (rev 40573)
+++ trunk/tests/tests/org.jboss.tools.tests.tests/src/org/jboss/tools/tests/tests/UtilsTest.java 2012-04-27 15:27:24 UTC (rev 40574)
@@ -1,14 +1,25 @@
package org.jboss.tools.tests.tests;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import org.eclipse.core.resources.IProject;
+import org.jboss.tools.test.util.TestProjectProvider;
import org.junit.Test;
public class UtilsTest {
+ private static final String PROJECT_NAME = "DynamicWebProject";
+
@Test
- public void test() {
- fail("Not yet implemented");
+ public void testProjectProvider() throws Exception {
+ TestProjectProvider provider = new TestProjectProvider(
+ "org.jboss.tools.tests.tests", null, PROJECT_NAME, false);
+ IProject project = provider.getProject();
+ assertNotNull("Project is not imported: " + PROJECT_NAME, project);
+ assertTrue("Project doesn't exist: " + PROJECT_NAME, project.exists());
+ assertTrue("Project isn't accessible: " + PROJECT_NAME, project.isAccessible());
+ assertTrue("Project isn't open: " + PROJECT_NAME, project.isOpen());
+ provider.dispose();
}
-
}
12 years, 8 months
JBoss Tools SVN: r40573 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-04-27 10:32:00 -0400 (Fri, 27 Apr 2012)
New Revision: 40573
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/openshift-logo-white-icon.png
Log:
updated to better small icon for openshift
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/icons/openshift-logo-white-icon.png
===================================================================
(Binary files differ)
12 years, 8 months
JBoss Tools SVN: r40572 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-04-27 09:52:37 -0400 (Fri, 27 Apr 2012)
New Revision: 40572
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ExceptionNotifier.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties
Log:
https://issues.jboss.org/browse/JBIDE-11498 : Show more informative messages when BrowserSim cannot be run
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ExceptionNotifier.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ExceptionNotifier.java 2012-04-27 13:41:51 UTC (rev 40571)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ExceptionNotifier.java 2012-04-27 13:52:37 UTC (rev 40572)
@@ -53,9 +53,9 @@
&& error.getMessage().contains("Safari must be installed to use a SWT.WEBKIT-style Browser")) {
message = Messages.ExceptionNotifier_APPLE_APPLICATION_SUPPORT_IS_NOT_FOUND;
} else if (PlatformUtil.OS_LINUX.equals(os) && error.getMessage() != null) { // Linux - probably WebKitGTK is not installed
- message = MessageFormat.format(Messages.ExceptionNotifier_WEBKIT_IS_FAILED_TO_START_ON_LINUX, error.getMessage());
+ message = MessageFormat.format(Messages.ExceptionNotifier_BROWSERSIM_IS_FAILED_TO_START_ON_LINUX, error.getMessage());
} else { // everything else
- message = MessageFormat.format(Messages.ExceptionNotifier_WEBKIT_IS_FAILED_TO_START, error.getMessage());
+ message = MessageFormat.format(Messages.ExceptionNotifier_BROWSERSIM_IS_FAILED_TO_START, error.getMessage());
}
showErrorMessageWithLinks(parentShell, message);
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java 2012-04-27 13:41:51 UTC (rev 40571)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java 2012-04-27 13:52:37 UTC (rev 40572)
@@ -40,9 +40,9 @@
public static String EditDeviceDialog_USER_AGENT;
public static String EditDeviceDialog_WIDTH;
public static String ExceptionNotifier_APPLE_APPLICATION_SUPPORT_IS_NOT_FOUND;
- public static String ExceptionNotifier_WEBKIT_IS_FAILED_TO_START;
+ public static String ExceptionNotifier_BROWSERSIM_IS_FAILED_TO_START;
public static String ExceptionNotifier_ONLY_32_BIT_ECLIPSE_IS_SUPPORTED_ON_WINDOWS;
- public static String ExceptionNotifier_WEBKIT_IS_FAILED_TO_START_ON_LINUX;
+ public static String ExceptionNotifier_BROWSERSIM_IS_FAILED_TO_START_ON_LINUX;
public static String ManageDevicesDialog_ADD;
public static String ManageDevicesDialog_CANCEL;
public static String ManageDevicesDialog_DEFAULT;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties 2012-04-27 13:41:51 UTC (rev 40571)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties 2012-04-27 13:52:37 UTC (rev 40572)
@@ -23,13 +23,13 @@
ExceptionNotifier_APPLE_APPLICATION_SUPPORT_IS_NOT_FOUND=Apple Application Support is not found.\n\
Please install <a href\="http\://www.apple.com/quicktime/download/">Apple QuickTime</a> or <a href\="http\://www.apple.com/itunes/download/">Apple iTunes</a> to run BrowserSim.\n\
Also see <a href\="https\://community.jboss.org/docs/DOC-18100">BrowserSim FAQ</a>.
-ExceptionNotifier_WEBKIT_IS_FAILED_TO_START=WebKit is failed to start with the following error:\n\
+ExceptionNotifier_BROWSERSIM_IS_FAILED_TO_START=BrowserSim is failed to start with the following error:\n\
\"{0}\"\n\
Also see <a href\="https\://community.jboss.org/docs/DOC-18100">BrowserSim FAQ</a>.
ExceptionNotifier_ONLY_32_BIT_ECLIPSE_IS_SUPPORTED_ON_WINDOWS=64-bit Eclipse/JBDS is not supported on Windows.\n\
Please install 32-bit Eclipse/JBDS to run BrowserSim.\n\
Also see <a href\="https\://community.jboss.org/docs/DOC-18100">BrowserSim FAQ</a>.
-ExceptionNotifier_WEBKIT_IS_FAILED_TO_START_ON_LINUX=WebKit is failed to start with the following error:\n\
+ExceptionNotifier_BROWSERSIM_IS_FAILED_TO_START_ON_LINUX=BrowserSim is failed to start with the following error:\n\
\"{0}\"\n\
Please note that WebKitGTK 1.2.0 or newer must be installed and available in the library load path.\n\
If not, use your package manager to install libwebkitgtk.\n\
12 years, 8 months
JBoss Tools SVN: r40571 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-04-27 09:41:51 -0400 (Fri, 27 Apr 2012)
New Revision: 40571
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ExceptionNotifier.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties
Log:
https://issues.jboss.org/browse/JBIDE-11498 : Show more informative messages when BrowserSim cannot be run
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ExceptionNotifier.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ExceptionNotifier.java 2012-04-27 13:35:40 UTC (rev 40570)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/ExceptionNotifier.java 2012-04-27 13:41:51 UTC (rev 40571)
@@ -52,11 +52,10 @@
&& error.getMessage() != null // Apple Application Support is not installed
&& error.getMessage().contains("Safari must be installed to use a SWT.WEBKIT-style Browser")) {
message = Messages.ExceptionNotifier_APPLE_APPLICATION_SUPPORT_IS_NOT_FOUND;
- } else if (PlatformUtil.OS_LINUX.equals(os) && error.getMessage() != null // WebKitGTK is not installed
- && error.getMessage().contains("WebKitGTK")) {
- message = Messages.ExceptionNotifier_WEBKIT_GTK_IS_NOT_FOUND;
+ } else if (PlatformUtil.OS_LINUX.equals(os) && error.getMessage() != null) { // Linux - probably WebKitGTK is not installed
+ message = MessageFormat.format(Messages.ExceptionNotifier_WEBKIT_IS_FAILED_TO_START_ON_LINUX, error.getMessage());
} else { // everything else
- message = MessageFormat.format(Messages.ExceptionNotifier_COULD_NOT_INSTANTIATE_WEBKIT_BROWSER, error.getMessage());
+ message = MessageFormat.format(Messages.ExceptionNotifier_WEBKIT_IS_FAILED_TO_START, error.getMessage());
}
showErrorMessageWithLinks(parentShell, message);
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java 2012-04-27 13:35:40 UTC (rev 40570)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/Messages.java 2012-04-27 13:41:51 UTC (rev 40571)
@@ -40,9 +40,9 @@
public static String EditDeviceDialog_USER_AGENT;
public static String EditDeviceDialog_WIDTH;
public static String ExceptionNotifier_APPLE_APPLICATION_SUPPORT_IS_NOT_FOUND;
- public static String ExceptionNotifier_COULD_NOT_INSTANTIATE_WEBKIT_BROWSER;
+ public static String ExceptionNotifier_WEBKIT_IS_FAILED_TO_START;
public static String ExceptionNotifier_ONLY_32_BIT_ECLIPSE_IS_SUPPORTED_ON_WINDOWS;
- public static String ExceptionNotifier_WEBKIT_GTK_IS_NOT_FOUND;
+ public static String ExceptionNotifier_WEBKIT_IS_FAILED_TO_START_ON_LINUX;
public static String ManageDevicesDialog_ADD;
public static String ManageDevicesDialog_CANCEL;
public static String ManageDevicesDialog_DEFAULT;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties 2012-04-27 13:35:40 UTC (rev 40570)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/messages.properties 2012-04-27 13:41:51 UTC (rev 40571)
@@ -20,17 +20,20 @@
EditDeviceDialog_SKIN=Skin:
EditDeviceDialog_USER_AGENT=User-Agent:
EditDeviceDialog_WIDTH=Width:
-ExceptionNotifier_APPLE_APPLICATION_SUPPORT_IS_NOT_FOUND=Apple Application Support is not found.\
-\nPlease install <a href=\"http://www.apple.com/quicktime/download/\">Apple QuickTime</a> or <a href=\"http://www.apple.com/itunes/download/\">Apple iTunes</a> to run BrowserSim.\
-\nAlso see <a href=\"https://community.jboss.org/docs/DOC-18100\">BrowserSim FAQ</a>.
-ExceptionNotifier_COULD_NOT_INSTANTIATE_WEBKIT_BROWSER=Could not instantiate WebKit Browser:\n{1}\
-\nAlso see <a href=\"https://community.jboss.org/docs/DOC-18100\">BrowserSim FAQ</a>.
-ExceptionNotifier_ONLY_32_BIT_ECLIPSE_IS_SUPPORTED_ON_WINDOWS=64-bit Eclipse/JBDS is not supported on Windows.\
-\nPlease install 32-bit Eclipse/JBDS to run BrowserSim.\
-\nAlso see <a href=\"https://community.jboss.org/docs/DOC-18100\">BrowserSim FAQ</a>.
-ExceptionNotifier_WEBKIT_GTK_IS_NOT_FOUND=WebKitGTK 1.2.0 or newer is not found in the library load path.\
-\nPlease use your package manager to install libwebkitgtk.\
-\nAlso see <a href=\"https://community.jboss.org/docs/DOC-18100\">BrowserSim FAQ</a>.
+ExceptionNotifier_APPLE_APPLICATION_SUPPORT_IS_NOT_FOUND=Apple Application Support is not found.\n\
+Please install <a href\="http\://www.apple.com/quicktime/download/">Apple QuickTime</a> or <a href\="http\://www.apple.com/itunes/download/">Apple iTunes</a> to run BrowserSim.\n\
+Also see <a href\="https\://community.jboss.org/docs/DOC-18100">BrowserSim FAQ</a>.
+ExceptionNotifier_WEBKIT_IS_FAILED_TO_START=WebKit is failed to start with the following error:\n\
+\"{0}\"\n\
+Also see <a href\="https\://community.jboss.org/docs/DOC-18100">BrowserSim FAQ</a>.
+ExceptionNotifier_ONLY_32_BIT_ECLIPSE_IS_SUPPORTED_ON_WINDOWS=64-bit Eclipse/JBDS is not supported on Windows.\n\
+Please install 32-bit Eclipse/JBDS to run BrowserSim.\n\
+Also see <a href\="https\://community.jboss.org/docs/DOC-18100">BrowserSim FAQ</a>.
+ExceptionNotifier_WEBKIT_IS_FAILED_TO_START_ON_LINUX=WebKit is failed to start with the following error:\n\
+\"{0}\"\n\
+Please note that WebKitGTK 1.2.0 or newer must be installed and available in the library load path.\n\
+If not, use your package manager to install libwebkitgtk.\n\
+Also see <a href\="https\://community.jboss.org/docs/DOC-18100">BrowserSim FAQ</a>.
ManageDevicesDialog_ADD=Add
ManageDevicesDialog_CANCEL=Cancel
ManageDevicesDialog_DEFAULT=DEFAULT
12 years, 8 months
JBoss Tools SVN: r40570 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-04-27 09:35:40 -0400 (Fri, 27 Apr 2012)
New Revision: 40570
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java
Log:
JBIDE-11672 openshift properties now shows port forwarding yes/no
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java 2012-04-27 13:33:39 UTC (rev 40569)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java 2012-04-27 13:35:40 UTC (rev 40570)
@@ -46,7 +46,7 @@
new PropertyDescriptor("6.UUID", "UUID"),
new PropertyDescriptor("5.Git URI", "Git URI"),
new PropertyDescriptor("2.Type", "Type"),
- new PropertyDescriptor("4.Created on", "Created on"), new PropertyDescriptor("7.Port Forward", "Port Forward") };
+ new PropertyDescriptor("4.Created on", "Created on"), new PropertyDescriptor("7.Port Forwarding", "Port Forwarding") };
}
@Override
@@ -71,16 +71,19 @@
if (id.equals("5.Git URI")) {
return application.getGitUrl();
}
- if(id.equals("7.Port Forward")) {
+ if(id.equals("7.Port Forwarding")) {
try {
StringBuffer bf = new StringBuffer();
- List<IApplicationPortForwarding> forwardablePorts = application.getForwardablePorts();
- for (IApplicationPortForwarding iApplicationPortForwarding : forwardablePorts) {
- bf.append(iApplicationPortForwarding);
+ boolean portFowardingStarted = application.isPortFowardingStarted();
+
+ if (portFowardingStarted == true) {
+ return bf.append("Yes");
+ } else if (portFowardingStarted == false) {
+ return bf.append("No");
}
- return bf.toString();
+
} catch (OpenShiftSSHOperationException e) {
- e.printStackTrace();
+ return "Unknown"; //e.printStackTrace();
}
}
12 years, 8 months
JBoss Tools SVN: r40569 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-04-27 09:33:39 -0400 (Fri, 27 Apr 2012)
New Revision: 40569
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java
Log:
added class header and javadoc
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java 2012-04-27 13:03:27 UTC (rev 40568)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java 2012-04-27 13:33:39 UTC (rev 40569)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.openshift.express.internal.core.portforward;
import java.io.IOException;
@@ -15,6 +25,9 @@
import com.openshift.client.IApplicationPortForwarding;
import com.openshift.client.OpenShiftSSHOperationException;
+/**
+ * @author Xavier Coulon
+ */
public class ApplicationPortForwardingWizardModel extends ObservablePojo {
public static final String PROPERTY_USE_DEFAULT_LOCAL_IP_ADDRESS = "useDefaultLocalIpAddress";
12 years, 8 months
JBoss Tools SVN: r40568 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-04-27 09:03:27 -0400 (Fri, 27 Apr 2012)
New Revision: 40568
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java
Log:
Fixed - JBIDE-11671
portforward: dialog should say which application we are enabling port forwarding on
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java 2012-04-27 12:59:28 UTC (rev 40567)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java 2012-04-27 13:03:27 UTC (rev 40568)
@@ -54,9 +54,10 @@
public ApplicationPortForwardingWizardPage(final ApplicationPortForwardingWizardModel wizardModel,
final ApplicationPortForwardingWizard applicationPortForwardingWizard) {
- super("Application port forward", "Please configure port forwarding for your application",
+ super("Application port forward", null,
"IApplicationPortForwardingingPage", applicationPortForwardingWizard);
this.wizardModel = wizardModel;
+ super.setDescription("Please configure port forwarding for the '" + wizardModel.getApplication().getName() + "' application");
}
@Override
12 years, 8 months