JBoss Tools SVN: r33324 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb: src/org/jboss/tools/jst/web/kb/preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-28 16:58:42 -0400 (Thu, 28 Jul 2011)
New Revision: 33324
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/AddKBSupportAction.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/RemoveKBSupportAction.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.properties
trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
Log:
JBIDE-9120
https://issues.jboss.org/browse/JBIDE-9120
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.properties 2011-07-28 20:55:35 UTC (rev 33323)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.properties 2011-07-28 20:58:42 UTC (rev 33324)
@@ -8,4 +8,7 @@
BuilderOrderProblemName=Builders Order Problem
ELValidator=EL Validator
-PreferencePage_KBSettings=JBoss Tools Knowledge Base
\ No newline at end of file
+PreferencePage_KBSettings=JBoss Tools Knowledge Base
+
+ConfigureMenu_AddKBSupport=Add JBoss Tools Knowledge Base Support
+ConfigureMenu_RemoveKBSupport=Remove JBoss Tools Knowledge Base Support
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2011-07-28 20:55:35 UTC (rev 33323)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/plugin.xml 2011-07-28 20:58:42 UTC (rev 33324)
@@ -305,4 +305,54 @@
</page>
</extension>
+ <extension
+ point="org.eclipse.ui.popupMenus">
+
+ <objectContribution
+ id="org.jboss.tools.web.kb.project.configure.enable"
+ objectClass="org.eclipse.core.resources.IProject"
+ adaptable="true">
+ <visibility>
+ <and>
+ <objectState
+ name="projectNature"
+ value="org.eclipse.jdt.core.javanature"/>
+ <not>
+ <objectState
+ name="projectNature"
+ value="org.jboss.tools.jst.web.kb.kbnature"/>
+ </not>
+ </and>
+ </visibility>
+
+ <action
+ id="org.jboss.tools.web.kb.AddKBSupport"
+ label="%ConfigureMenu_AddKBSupport"
+ class="org.jboss.tools.jst.web.kb.preferences.AddKBSupportAction"
+ enablesFor="1"
+ menubarPath="org.eclipse.ui.projectConfigure/additions"/>
+
+ </objectContribution>
+
+ <objectContribution
+ id="org.jboss.tools.web.kb.project.configure.disable"
+ objectClass="org.eclipse.core.resources.IProject"
+ adaptable="true">
+ <visibility>
+ <objectState
+ name="projectNature"
+ value="org.jboss.tools.jst.web.kb.kbnature"/>
+ </visibility>
+
+ <action
+ id="org.jboss.tools.web.kb.RemoveKBSupport"
+ label="%ConfigureMenu_RemoveKBSupport"
+ class="org.jboss.tools.jst.web.kb.preferences.RemoveKBSupportAction"
+ enablesFor="1"
+ menubarPath="org.eclipse.ui.projectConfigure/additions"/>
+
+ </objectContribution>
+
+ </extension>
+
</plugin>
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/AddKBSupportAction.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/AddKBSupportAction.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/AddKBSupportAction.java 2011-07-28 20:58:42 UTC (rev 33324)
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.jst.web.kb.preferences;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.preference.PreferenceDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IObjectActionDelegate;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.PreferencesUtil;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class AddKBSupportAction implements IObjectActionDelegate {
+
+ private ISelection currentSelection;
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
+ */
+ public void setActivePart(IAction action, IWorkbenchPart targetPart) {
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+ */
+ public void run(IAction action) {
+ IProject project = (IProject) ((IStructuredSelection) currentSelection).getFirstElement();
+ PreferenceDialog dialog = PreferencesUtil.createPropertyDialogOn(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), project, KBSettingsPreferencePage.ID, new String[] {KBSettingsPreferencePage.ID}, null);
+ KBSettingsPreferencePage page = (KBSettingsPreferencePage)dialog.getSelectedPage();
+ page.setEnabledKBSuport(shouldEnable());
+ dialog.open();
+ }
+
+ protected boolean shouldEnable() {
+ return true;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
+ */
+ public void selectionChanged(IAction action, ISelection selection) {
+ this.currentSelection = selection;
+ }
+}
\ No newline at end of file
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/AddKBSupportAction.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/RemoveKBSupportAction.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/RemoveKBSupportAction.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/RemoveKBSupportAction.java 2011-07-28 20:58:42 UTC (rev 33324)
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.jst.web.kb.preferences;
+
+public class RemoveKBSupportAction extends AddKBSupportAction {
+
+ protected boolean shouldEnable() {
+ return false;
+ }
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/preferences/RemoveKBSupportAction.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 5 months
JBoss Tools SVN: r33323 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-28 16:55:35 -0400 (Thu, 28 Jul 2011)
New Revision: 33323
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
Log:
JBIDE-9420
https://issues.jboss.org/browse/JBIDE-9420
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-07-28 19:55:24 UTC (rev 33322)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-07-28 20:55:35 UTC (rev 33323)
@@ -675,7 +675,9 @@
} else if(es[i].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(es[i].getPath().lastSegment());
if(p == null || !p.isAccessible()) continue;
- if(p.hasNature(JavaCore.NATURE_ID) && !p.hasNature("org.jboss.tools.jst.web.kb.kbnature")) {
+ if(p.hasNature(JavaCore.NATURE_ID)
+ && !p.hasNature("org.jboss.tools.jst.web.kb.kbnature")
+ && project.hasNature("org.jboss.tools.jst.web.kb.kbnature")) {
String[] srcs = getJavaProjectSrcLocations(p);
for (String s: srcs) l.add(s);
}
13 years, 5 months
JBoss Tools SVN: r33322 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-28 15:55:24 -0400 (Thu, 28 Jul 2011)
New Revision: 33322
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemImpl.java
Log:
JBIDE-9420
https://issues.jboss.org/browse/JBIDE-9420
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemImpl.java 2011-07-28 19:37:21 UTC (rev 33321)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemImpl.java 2011-07-28 19:55:24 UTC (rev 33322)
@@ -89,6 +89,7 @@
return resource = f;
}
+ String wsloc = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString().replace('\\', '/');
IContainer f = null;
URI uri = URIUtil.toURI(thloc, true);
IContainer[] cs = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocationURI(uri);
@@ -109,10 +110,12 @@
if(resource == null) {
f = project.getFolder(new Path(XModelObjectConstants.SEPARATOR + getAttributeValue(XModelObjectConstants.ATTR_NAME)));
if(!f.exists()) {
+ //Only create link if actual resource exists and
+ //all other means to find resource in workspace failed.
+ //Besides, never create link for actual resources inside workspace -
+ //if they do not appear in the workspace, let them be invisible to model as well.
try {
- if(new File(thloc).exists()) {
- //only create link if actual resource exists and
- //all other means to find resource in workspace failed.
+ if(!thloc.startsWith(wsloc) && new File(thloc).exists()) {
((IFolder)f).createLink(new Path(thloc), IFolder.FORCE, null);
resource = f;
}
13 years, 5 months
JBoss Tools SVN: r33321 - in trunk/common/plugins/org.jboss.tools.common.model: src/org/jboss/tools/common/model/filesystems/impl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-28 15:37:21 -0400 (Thu, 28 Jul 2011)
New Revision: 33321
Modified:
trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemImpl.java
Log:
JBIDE-9420
https://issues.jboss.org/browse/JBIDE-9420
Modified: trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2011-07-28 19:13:29 UTC (rev 33320)
+++ trunk/common/plugins/org.jboss.tools.common.model/META-INF/MANIFEST.MF 2011-07-28 19:37:21 UTC (rev 33321)
@@ -82,7 +82,8 @@
org.eclipse.jem.util;bundle-version="2.1.2",
org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.2.100",
org.eclipse.core.resources;visibility:=reexport;bundle-version="3.7.100",
- org.eclipse.core.runtime;visibility:=reexport;bundle-version="3.7.0"
+ org.eclipse.core.runtime;visibility:=reexport;bundle-version="3.7.0",
+ org.eclipse.core.filesystem
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: org.jboss.tools.common.model.jar
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemImpl.java 2011-07-28 19:13:29 UTC (rev 33320)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemImpl.java 2011-07-28 19:37:21 UTC (rev 33321)
@@ -12,8 +12,10 @@
import java.io.File;
import java.io.IOException;
+import java.net.URI;
import org.eclipse.core.resources.*;
+import org.eclipse.core.filesystem.URIUtil;
import org.eclipse.core.runtime.*;
import org.jboss.tools.common.model.XModelObjectConstants;
import org.jboss.tools.common.model.plugin.ModelPlugin;
@@ -87,17 +89,42 @@
return resource = f;
}
- IFolder f = project.getFolder(new Path(XModelObjectConstants.SEPARATOR + getAttributeValue(XModelObjectConstants.ATTR_NAME)));
- if(!f.exists()) {
- try {
- f.createLink(new Path(thloc), IFolder.FORCE, null);
- resource = f;
- } catch (CoreException e) {
- ModelPlugin.getPluginLog().logError("Cannot create link: " + e.getMessage()); //$NON-NLS-1$
- ModelPlugin.getPluginLog().logError("Project path=" + prloc); //$NON-NLS-1$
- ModelPlugin.getPluginLog().logError(" Link path=" + thloc); //$NON-NLS-1$
- }
- } else resource = f;
+ IContainer f = null;
+ URI uri = URIUtil.toURI(thloc, true);
+ IContainer[] cs = ResourcesPlugin.getWorkspace().getRoot().findContainersForLocationURI(uri);
+ for (IContainer c: cs) {
+ if(f == null || !c.isLinked()) {
+ f = c;
+ }
+ }
+ if(f != null && (!f.exists() && !f.isSynchronized(IResource.DEPTH_ONE))) {
+ try {
+ f.refreshLocal(IResource.DEPTH_ONE, new NullProgressMonitor());
+ } catch (CoreException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ }
+ }
+ resource = f;
+
+ if(resource == null) {
+ f = project.getFolder(new Path(XModelObjectConstants.SEPARATOR + getAttributeValue(XModelObjectConstants.ATTR_NAME)));
+ if(!f.exists()) {
+ try {
+ if(new File(thloc).exists()) {
+ //only create link if actual resource exists and
+ //all other means to find resource in workspace failed.
+ ((IFolder)f).createLink(new Path(thloc), IFolder.FORCE, null);
+ resource = f;
+ }
+ } catch (CoreException e) {
+ ModelPlugin.getPluginLog().logError("Cannot create link: " + e.getMessage()); //$NON-NLS-1$
+ ModelPlugin.getPluginLog().logError("Project path=" + prloc); //$NON-NLS-1$
+ ModelPlugin.getPluginLog().logError(" Link path=" + thloc); //$NON-NLS-1$
+ }
+ } else {
+ resource = f;
+ }
+ }
return resource;
}
13 years, 5 months
JBoss Tools SVN: r33320 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-28 15:13:29 -0400 (Thu, 28 Jul 2011)
New Revision: 33320
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/.gitignore
Log:
.gitignore file
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/.gitignore
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/.gitignore (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/.gitignore 2011-07-28 19:13:29 UTC (rev 33320)
@@ -0,0 +1 @@
+jsf-vpe-myfaces.jar
13 years, 5 months
JBoss Tools SVN: r33319 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-28 15:13:16 -0400 (Thu, 28 Jul 2011)
New Revision: 33319
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/.gitignore
Log:
.gitignore file
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/.gitignore
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/.gitignore (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/.gitignore 2011-07-28 19:13:16 UTC (rev 33319)
@@ -0,0 +1 @@
+vpefacelets.jar
13 years, 5 months
JBoss Tools SVN: r33318 - in trunk/download.jboss.org/jbosstools/updates: indigo/SR0 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-07-28 15:11:18 -0400 (Thu, 28 Jul 2011)
New Revision: 33318
Modified:
trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeArtifacts...
trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeContent.xml
Log:
link to updated m2e/m2e-wtp/m2e-extras site
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-07-28 19:10:59 UTC (rev 33317)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-07-28 19:11:18 UTC (rev 33318)
@@ -12,7 +12,7 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1310665401000'/>
+<property name='p2.timestamp' value='1311879867000'/>
</properties>
<children size='13'>
<child location='../requirements/helios/SR2/'/>
@@ -22,7 +22,7 @@
<child location='../requirements/emf/2.6/'/>
<child location='../requirements/gwt/201012211742/'/>
-<child location='../requirements/m2eclipse/20110623-1035/'/>
+<child location='../requirements/m2eclipse/20110728-1500/'/>
<child location='../requirements/m2eclipse/m2eclipse-wtp-0.13.1/'/>
<child location='../requirements/orbit/R20100519200754/'/>
<child location='../requirements/swtbot/2.0.3/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-07-28 19:10:59 UTC (rev 33317)
+++ trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-07-28 19:11:18 UTC (rev 33318)
@@ -12,7 +12,7 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1310665401000'/>
+<property name='p2.timestamp' value='1311879881000'/>
</properties>
<children size='13'>
<child location='../requirements/helios/SR2/'/>
@@ -22,7 +22,7 @@
<child location='../requirements/emf/2.6/'/>
<child location='../requirements/gwt/201012211742/'/>
-<child location='../requirements/m2eclipse/20110623-1035/'/>
+<child location='../requirements/m2eclipse/20110728-1500/'/>
<child location='../requirements/m2eclipse/m2eclipse-wtp-0.13.1/'/>
<child location='../requirements/orbit/R20100519200754/'/>
<child location='../requirements/swtbot/2.0.3/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeArtifacts...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeArtifacts... 2011-07-28 19:10:59 UTC (rev 33317)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeArtifacts... 2011-07-28 19:11:18 UTC (rev 33318)
@@ -3,7 +3,7 @@
<repository name='JBoss Tools Requirements - Composite Indigo SR0 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1311345967000'/>
+<property name='p2.timestamp' value='1311879789000'/>
</properties>
<children size='12'>
<child location='../../requirements/indigo/201105270900-RC2/'/>
@@ -12,7 +12,7 @@
<child location='../../requirements/eclipse/3.7RC5/'/>
<child location='../../requirements/emf/2.7RC3/'/>
-<child location='../../requirements/m2eclipse/20110623-1035/'/>
+<child location='../../requirements/m2eclipse/20110728-1500/'/>
<child location='../../requirements/m2eclipse/m2eclipse-wtp-0.13.1/'/>
<child location='../../requirements/orbit/R20110523182458/'/>
<child location='../../requirements/swtbot/2.0.4/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeContent.xml 2011-07-28 19:10:59 UTC (rev 33317)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeContent.xml 2011-07-28 19:11:18 UTC (rev 33318)
@@ -3,7 +3,7 @@
<repository name='JBoss Tools Requirements - Composite Indigo SR0 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1311345969000'/>
+<property name='p2.timestamp' value='1311879829000'/>
</properties>
<children size='12'>
<child location='../../requirements/indigo/201105270900-RC2/'/>
@@ -12,7 +12,7 @@
<child location='../../requirements/eclipse/3.7RC5/'/>
<child location='../../requirements/emf/2.7RC3/'/>
-<child location='../../requirements/m2eclipse/20110623-1035/'/>
+<child location='../../requirements/m2eclipse/20110728-1500/'/>
<child location='../../requirements/m2eclipse/m2eclipse-wtp-0.13.1/'/>
<child location='../../requirements/orbit/R20110523182458/'/>
<child location='../../requirements/swtbot/2.0.4/'/>
13 years, 5 months
JBoss Tools SVN: r33316 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-07-28 15:02:27 -0400 (Thu, 28 Jul 2011)
New Revision: 33316
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DisposerInObserver.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.qfxresult
Log:
https://issues.jboss.org/browse/JBIDE-9419
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DisposerInObserver.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DisposerInObserver.java 2011-07-28 18:25:38 UTC (rev 33315)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/DisposerInObserver.java 2011-07-28 19:02:27 UTC (rev 33316)
@@ -10,7 +10,7 @@
return "a";
}
- public void method(@Observes String param1, @Disposes String param2){
+ public void method(@Observes Boolean param1, @Disposes Boolean param2){
}
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.java 2011-07-28 18:25:38 UTC (rev 33315)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.java 2011-07-28 19:02:27 UTC (rev 33316)
@@ -9,7 +9,7 @@
public class ObserverInDecorator {
@Inject @Delegate @AAnnotation String str;
- public void method(@Observes String param){
+ public void method(@Observes Boolean param){
}
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.qfxresult 2011-07-28 18:25:38 UTC (rev 33315)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInDecorator.qfxresult 2011-07-28 19:02:27 UTC (rev 33316)
@@ -8,7 +8,7 @@
public class ObserverInDecorator {
@Inject @Delegate @AAnnotation String str;
- public void method(String param){
+ public void method(Boolean param){
}
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.java 2011-07-28 18:25:38 UTC (rev 33315)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.java 2011-07-28 19:02:27 UTC (rev 33316)
@@ -9,7 +9,7 @@
@FooBinding
public class ObserverInInterceptor {
- public void method(@Observes String param){
+ public void method(@Observes Boolean param){
}
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.qfxresult
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.qfxresult 2011-07-28 18:25:38 UTC (rev 33315)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/ObserverInInterceptor.qfxresult 2011-07-28 19:02:27 UTC (rev 33316)
@@ -8,7 +8,7 @@
@FooBinding
public class ObserverInInterceptor {
- public void method(String param){
+ public void method(Boolean param){
}
}
13 years, 5 months
JBoss Tools SVN: r33315 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-07-28 14:25:38 -0400 (Thu, 28 Jul 2011)
New Revision: 33315
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectResourceBundles.java
Log:
JBIDE-9420
https://issues.jboss.org/browse/JBIDE-9420
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectResourceBundles.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectResourceBundles.java 2011-07-28 18:23:25 UTC (rev 33314)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectResourceBundles.java 2011-07-28 18:25:38 UTC (rev 33315)
@@ -63,7 +63,7 @@
XModelObject[] cs = FileSystemsHelper.getFileSystems(getModel()).getChildren("FileSystemFolder");
for (int i = 0; i < cs.length; i++) {
String n = cs[i].getAttributeValue("name");
- if(n.startsWith("src")) list.add(cs[i]);
+ if(n.startsWith("src") || n.startsWith("lib-")) list.add(cs[i]);
}
XModelObject web = getModel().getByPath("Web");
XModelObject[] ms = (web == null) ? new XModelObject[0] : web.getChildren("WebJSFModule");
13 years, 5 months