JBoss Tools SVN: r38378 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-02-01 16:55:39 -0500 (Wed, 01 Feb 2012)
New Revision: 38378
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java
Log:
JBIDE-10763 Project examples cache logic is faulty
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java 2012-02-01 21:05:44 UTC (rev 38377)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/model/ProjectUtil.java 2012-02-01 21:55:39 UTC (rev 38378)
@@ -80,6 +80,8 @@
public static final String CHEATSHEETS = "cheatsheets"; //$NON-NLS-1$
public static final String PROTOCOL_FILE = "file"; //$NON-NLS-1$
+
+ public static final String PROTOCOL_PLATFORM = "platform"; //$NON-NLS-1$
private static final String PROJECT_EXAMPLES_XML_EXTENSION_ID = "org.jboss.tools.project.examples.projectExamplesXml"; //$NON-NLS-1$
@@ -519,7 +521,7 @@
public static File getProjectExamplesFile(URL url, String prefix,
String suffix, IProgressMonitor monitor) {
File file = null;
- if (PROTOCOL_FILE.equals(url.getProtocol())) {
+ if (PROTOCOL_FILE.equals(url.getProtocol()) || PROTOCOL_PLATFORM.equalsIgnoreCase(url.getProtocol())) {
try {
// assume all illegal characters have been properly encoded, so
// use URI class to unencode
12 years, 3 months
JBoss Tools SVN: r38377 - in trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core: internal/project/facet and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-02-01 16:05:44 -0500 (Wed, 01 Feb 2012)
New Revision: 38377
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil.java
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil25.java
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java
Log:
JBIDE-10673 NullPointerException when creating Dynamic Web Project with JSF Portlet facet and no targeted runtime
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil.java 2012-02-01 20:31:34 UTC (rev 38376)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil.java 2012-02-01 21:05:44 UTC (rev 38377)
@@ -240,6 +240,9 @@
public String getFacesConfig(IProject project,
IProgressMonitor monitor) {
WebApp webApp = getWebApp(project, monitor);
+ if (webApp == null) {
+ return null;
+ }
EList contextParams = webApp.getContextParams();
for (Iterator iterator = contextParams.iterator(); iterator.hasNext();) {
Object paramObj = (Object) iterator.next();
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil25.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil25.java 2012-02-01 20:31:34 UTC (rev 38376)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/JBossWebUtil25.java 2012-02-01 21:05:44 UTC (rev 38377)
@@ -253,6 +253,9 @@
public String getFacesConfig(IProject project, IProgressMonitor monitor) {
WebApp webApp = getWebApp(project, monitor);
+ if (webApp == null) {
+ return null;
+ }
List contextParams = webApp.getContextParams();
for (Iterator iterator = contextParams.iterator(); iterator.hasNext();) {
Object paramObj = (Object) iterator.next();
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2012-02-01 20:31:34 UTC (rev 38376)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2012-02-01 21:05:44 UTC (rev 38377)
@@ -544,7 +544,7 @@
} else {
portletbridgeHome = new File(portletbridgeRuntime);
}
- if (!portletbridgeHome.exists()) {
+ if (portletbridgeHome == null || !portletbridgeHome.exists()) {
PortletCoreActivator.log(null, Messages.PortletPostInstallListener_Cannot_find_Portletbridge_Runtime);
return;
}
12 years, 3 months
JBoss Tools SVN: r38376 - in trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core: libprov and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-02-01 15:31:34 -0500 (Wed, 01 Feb 2012)
New Revision: 38376
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetUninstallDelegate.java
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetUninstallDelegate.java
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/PortletServerRuntimeLibraryProviderInstallOperation.java
Log:
JBIDE-10259 Cannot add JBoss Core Portlet facet if it has been removed before.
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetUninstallDelegate.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetUninstallDelegate.java 2012-02-01 19:34:02 UTC (rev 38375)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetUninstallDelegate.java 2012-02-01 20:31:34 UTC (rev 38376)
@@ -10,11 +10,20 @@
************************************************************************************/
package org.jboss.tools.portlet.core.internal.project.facet;
+import java.util.ArrayList;
+import java.util.List;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.jboss.tools.portlet.core.IPortletConstants;
/**
* @author snjeza
@@ -27,8 +36,7 @@
*/
public void execute(IProject project, IProjectFacetVersion fv,
Object config, IProgressMonitor monitor) throws CoreException {
- // TODO Auto-generated method stub
-
+
}
}
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetUninstallDelegate.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetUninstallDelegate.java 2012-02-01 19:34:02 UTC (rev 38375)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetUninstallDelegate.java 2012-02-01 20:31:34 UTC (rev 38376)
@@ -10,11 +10,20 @@
************************************************************************************/
package org.jboss.tools.portlet.core.internal.project.facet;
+import java.util.ArrayList;
+import java.util.List;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.jboss.tools.portlet.core.IPortletConstants;
/**
* @author snjeza
@@ -27,8 +36,24 @@
*/
public void execute(IProject project, IProjectFacetVersion fv,
Object config, IProgressMonitor monitor) throws CoreException {
- // TODO Auto-generated method stub
-
+ IJavaProject javaProject = JavaCore.create(project);
+ if (javaProject != null && javaProject.exists()) {
+ IClasspathEntry[] entries = javaProject.getRawClasspath();
+ IPath containerPath = new Path(IPortletConstants.PORTLET_RUNTIME_CONTAINER_ID);
+ List<IClasspathEntry> newEntries = new ArrayList<IClasspathEntry>();
+ for (IClasspathEntry entry:entries) {
+ if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
+ IPath path = entry.getPath();
+ if (containerPath.equals(path)) {
+ continue;
+ }
+ }
+ newEntries.add(entry);
+ }
+ if (newEntries.size() != entries.length) {
+ javaProject.setRawClasspath(newEntries.toArray(new IClasspathEntry[0]), monitor);
+ }
+ }
}
}
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/PortletServerRuntimeLibraryProviderInstallOperation.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/PortletServerRuntimeLibraryProviderInstallOperation.java 2012-02-01 19:34:02 UTC (rev 38375)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/PortletServerRuntimeLibraryProviderInstallOperation.java 2012-02-01 20:31:34 UTC (rev 38376)
@@ -8,7 +8,6 @@
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider;
import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperation;
import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperationConfig;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectBase;
@@ -30,8 +29,16 @@
}
private void setContainerPath(IProgressMonitor monitor, IJavaProject javaProject,IPath containerPath) throws CoreException {
+ IClasspathEntry[] entries = javaProject.getRawClasspath();
+ for (IClasspathEntry entry:entries) {
+ if (entry.getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
+ IPath path = entry.getPath();
+ if (containerPath.equals(path)) {
+ return;
+ }
+ }
+ }
IClasspathEntry entry = JavaCore.newContainerEntry(containerPath, true);
- IClasspathEntry[] entries = javaProject.getRawClasspath();
IClasspathEntry[] newEntries = new IClasspathEntry[entries.length + 1];
System.arraycopy( entries, 0, newEntries, 0, entries.length );
newEntries[entries.length] = entry;
12 years, 3 months
JBoss Tools SVN: r38375 - trunk/jst/tests/org.jboss.tools.jst.web.kb.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-01 14:34:02 -0500 (Wed, 01 Feb 2012)
New Revision: 38375
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml
Log:
removed exploded bundles configuration
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml 2012-02-01 19:31:21 UTC (rev 38374)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml 2012-02-01 19:34:02 UTC (rev 38375)
@@ -16,18 +16,4 @@
<emma.instrument.bundles>org.jboss.tools.jst.web.kb</emma.instrument.bundles>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <configuration>
- <explodedBundles>
- <bundle>org.jboss.tools.jst.web.kb</bundle>
- </explodedBundles>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
12 years, 3 months
JBoss Tools SVN: r38374 - in trunk/jst/plugins: org.jboss.tools.jst.web/META-INF and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-01 14:31:21 -0500 (Wed, 01 Feb 2012)
New Revision: 38374
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
Log:
Eclipse-BundleShape: dir added to jst plugins that should be installed unpacked
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2012-02-01 19:25:53 UTC (rev 38373)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2012-02-01 19:31:21 UTC (rev 38374)
@@ -60,4 +60,4 @@
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .
-
+Eclipse-BundleShape: dir
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2012-02-01 19:25:53 UTC (rev 38373)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2012-02-01 19:31:21 UTC (rev 38374)
@@ -59,4 +59,5 @@
org.jboss.tools.jst.web.webapp.model,
org.jboss.tools.jst.web.webapp.model.handlers
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Eclipse-BundleShape: dir
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2012-02-01 19:25:53 UTC (rev 38373)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2012-02-01 19:31:21 UTC (rev 38374)
@@ -48,3 +48,4 @@
org.jboss.tools.jst.web.kb.taglib
Bundle-ClassPath: .
Import-Package: org.eclipse.search.ui.text
+Eclipse-BundleShape: dir
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 2012-02-01 19:25:53 UTC (rev 38373)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 2012-02-01 19:31:21 UTC (rev 38374)
@@ -26,3 +26,4 @@
org.eclipse.core.runtime;bundle-version="3.7.0"
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Eclipse-BundleShape: dir
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF 2012-02-01 19:25:53 UTC (rev 38373)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF 2012-02-01 19:31:21 UTC (rev 38374)
@@ -49,3 +49,4 @@
org.eclipse.core.expressions;bundle-version="3.4.200"
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Eclipse-BundleShape: dir
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2012-02-01 19:25:53 UTC (rev 38373)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2012-02-01 19:31:21 UTC (rev 38374)
@@ -51,3 +51,4 @@
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
+Eclipse-BundleShape: dir
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF 2012-02-01 19:25:53 UTC (rev 38373)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF 2012-02-01 19:31:21 UTC (rev 38374)
@@ -16,3 +16,4 @@
Bundle-Version: 3.3.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Eclipse-BundleShape: dir
12 years, 3 months
JBoss Tools SVN: r38373 - trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-02-01 14:25:53 -0500 (Wed, 01 Feb 2012)
New Revision: 38373
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
Log:
JBIDE-9635 Duplicate view-handler in faces-config.xml in JBoss Seam/Portlet Project
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2012-02-01 18:29:51 UTC (rev 38372)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2012-02-01 19:25:53 UTC (rev 38373)
@@ -45,7 +45,8 @@
private static final String ORG_JBOSS_PORTLET_STATE_MANAGER = "org.jboss.portletbridge.application.PortletStateManager"; //$NON-NLS-1$
private static final String ORG_JBOSS_PORTLET_VIEW_HANDLER = "org.jboss.portletbridge.application.PortletViewHandler"; //$NON-NLS-1$
-
+ private static final String COM_SUN_FACELETS_VIEW_HANDLER = "com.sun.facelets.FaceletViewHandler"; //$NON-NLS-1$
+
/*
* (non-Javadoc)
*
@@ -179,12 +180,19 @@
for (Iterator iterator = applications.iterator(); iterator.hasNext();) {
ApplicationType application = (ApplicationType) iterator.next();
EList viewHandlers = application.getViewHandler();
+ ViewHandlerType faceletsHandler = null;
for (Iterator iterator2 = viewHandlers.iterator(); iterator2.hasNext();) {
ViewHandlerType viewHandler = (ViewHandlerType) iterator2.next();
if (ORG_JBOSS_PORTLET_VIEW_HANDLER.equals(viewHandler.getTextContent())) {
facesState.viewHandlerExists = true;
}
- }
+ if (COM_SUN_FACELETS_VIEW_HANDLER.equals(viewHandler.getTextContent())) {
+ faceletsHandler = viewHandler;
+ }
+ }
+ if (faceletsHandler != null) {
+ viewHandlers.remove(faceletsHandler);
+ }
}
for (Iterator iterator = applications.iterator(); iterator.hasNext();) {
ApplicationType application = (ApplicationType) iterator.next();
12 years, 3 months
JBoss Tools SVN: r38372 - trunk/portlet/features/org.jboss.tools.portlet.feature.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-02-01 13:29:51 -0500 (Wed, 01 Feb 2012)
New Revision: 38372
Modified:
trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml
Log:
JBIDE-10626 Cannot use Portlet plugin with Eclipse for Java developers
Modified: trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml
===================================================================
--- trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml 2012-02-01 18:14:57 UTC (rev 38371)
+++ trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml 2012-02-01 18:29:51 UTC (rev 38372)
@@ -20,6 +20,11 @@
<requires>
<import feature="org.jboss.tools.seam.feature" version="3.2.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.jst.enterprise_ui.feature" version="3.3.1" match="greaterOrEqual"/>
+ <import feature="org.eclipse.jst.web_core.feature" version="3.3.1" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.wst.jsdt.web.core"/>
+ <import plugin="org.eclipse.wst.jsdt.web.support.jsp"/>
+ <import plugin="org.eclipse.wst.jsdt.web.ui"/>
</requires>
<plugin
12 years, 3 months
JBoss Tools SVN: r38371 - workspace/snjeza/jbossas7-examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-02-01 13:14:57 -0500 (Wed, 01 Feb 2012)
New Revision: 38371
Modified:
workspace/snjeza/jbossas7-examples/login.zip
Log:
JBIDE-10758 Wrong project name in the JBoss quickstart 'Login' cheatsheet
Modified: workspace/snjeza/jbossas7-examples/login.zip
===================================================================
(Binary files differ)
12 years, 3 months
JBoss Tools SVN: r38370 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-02-01 12:32:50 -0500 (Wed, 01 Feb 2012)
New Revision: 38370
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-10767
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-02-01 15:16:45 UTC (rev 38369)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-02-01 17:32:50 UTC (rev 38370)
@@ -188,7 +188,7 @@
int i=0;
for (ELReference el : els) {
IResource resource = el.getResource();
- if(resource.isAccessible() && !filesToValidate.contains(resource) && notValidatedYet(resource)) {
+ if(resource instanceof IFile && shouldBeValidated((IFile)resource) && !filesToValidate.contains(resource) && notValidatedYet(resource)) {
// Don't re-validate more than 1000 ELs.
if(i++>1000) {
break;
@@ -371,9 +371,9 @@
length = propertyName.length();
}
markers++;
-
+
IJavaSourceReference reference = getJavaReference(file, startPosition, length);
-
+
if(reference != null) {
IMarker marker = addError(ELValidationMessages.UNPAIRED_GETTER_OR_SETTER, ELSeverityPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedMethodName, missingMethodName}, reference, file);
elReference.addMarker(marker);
@@ -381,7 +381,6 @@
IMarker marker = addError(ELValidationMessages.UNPAIRED_GETTER_OR_SETTER, ELSeverityPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedMethodName, missingMethodName}, elReference.getLineNumber(), length, startPosition, file);
elReference.addMarker(marker);
}
-
}
}
}
@@ -413,7 +412,7 @@
}
markers++;
IJavaSourceReference reference = getJavaReference(file, offsetOfVarName, lengthOfVarName);
-
+
IMarker marker = null;
// Mark invalid EL
if(unresolvedTokenIsVariable) {
12 years, 3 months
JBoss Tools SVN: r38369 - trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-02-01 10:16:45 -0500 (Wed, 01 Feb 2012)
New Revision: 38369
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java
Log:
JBIDE-10778
ClassHyperlink.doHyperlink(IRegion region) fails to execute when region has escaped symbols like \r\n\t
Issue is fixed
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2012-02-01 14:17:36 UTC (rev 38368)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2012-02-01 15:16:45 UTC (rev 38369)
@@ -84,7 +84,7 @@
private String getClassName(IRegion region) {
try {
- return getDocument().get(region.getOffset(), region.getLength());
+ return getDocument().get(region.getOffset(), region.getLength()).trim();
} catch (BadLocationException x) {
// Ignore
return null;
12 years, 3 months