JBoss Tools SVN: r17170 - in trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui: src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-19 21:36:34 -0400 (Wed, 19 Aug 2009)
New Revision: 17170
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ExternalJarReferenceWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/JarReferenceWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ProjectReferenceWizardFragment.java
Log:
as.wtp.ui does not depend on as.wtp.core anymore... for now.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF 2009-08-20 00:29:38 UTC (rev 17169)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/META-INF/MANIFEST.MF 2009-08-20 01:36:34 UTC (rev 17170)
@@ -21,7 +21,6 @@
org.eclipse.jem.util;bundle-version="2.0.200",
org.eclipse.jst.jee;bundle-version="1.0.200",
org.eclipse.jdt.ui;bundle-version="3.5.0",
- org.jboss.ide.eclipse.as.wtp.override.core;bundle-version="1.0.0",
org.eclipse.wst.server.ui;bundle-version="1.1.102",
org.eclipse.wst.server.core;bundle-version="1.1.101",
org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.1.300",
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-08-20 00:29:38 UTC (rev 17169)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/AddModuleDependenciesPropertiesPage.java 2009-08-20 01:36:34 UTC (rev 17170)
@@ -79,7 +79,6 @@
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.jboss.ide.eclipse.as.wtp.override.core.vcf.ComponentUtils;
import org.jboss.ide.eclipse.as.wtp.override.ui.Messages;
import org.jboss.ide.eclipse.as.wtp.override.ui.WTPOveridePlugin;
@@ -849,7 +848,7 @@
*/
protected String getVirtualComponentNameWithExtension(IVirtualComponent virtComp) {
String virtCompURIMapName = this.getURIMappingName(virtComp);
- String extension = ComponentUtils.getDefaultProjectExtension(virtComp);
+ String extension = ".jar";
virtCompURIMapName += extension;
return virtCompURIMapName;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ExternalJarReferenceWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ExternalJarReferenceWizardFragment.java 2009-08-20 00:29:38 UTC (rev 17169)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ExternalJarReferenceWizardFragment.java 2009-08-20 01:36:34 UTC (rev 17170)
@@ -1,43 +1,16 @@
package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
-import org.eclipse.wst.server.ui.wizard.WizardFragment;
-import org.jboss.ide.eclipse.as.wtp.override.core.vcf.ComponentUtils;
public class ExternalJarReferenceWizardFragment extends JarReferenceWizardFragment {
public Composite createComposite(Composite parent, IWizardHandle handle) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/JarReferenceWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/JarReferenceWizardFragment.java 2009-08-20 00:29:38 UTC (rev 17169)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/JarReferenceWizardFragment.java 2009-08-20 01:36:34 UTC (rev 17170)
@@ -1,23 +1,17 @@
package org.jboss.ide.eclipse.as.wtp.override.ui.propertypage;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
@@ -27,17 +21,11 @@
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
-import org.jboss.ide.eclipse.as.wtp.override.core.vcf.ComponentUtils;
public class JarReferenceWizardFragment extends WizardFragment {
protected LabelProvider labelProvider = null;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ProjectReferenceWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ProjectReferenceWizardFragment.java 2009-08-20 00:29:38 UTC (rev 17169)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/ui/propertypage/ProjectReferenceWizardFragment.java 2009-08-20 01:36:34 UTC (rev 17170)
@@ -32,7 +32,6 @@
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
-import org.jboss.ide.eclipse.as.wtp.override.core.vcf.ComponentUtils;
public class ProjectReferenceWizardFragment extends WizardFragment {
private LabelProvider labelProvider = null;
@@ -83,7 +82,7 @@
}
IVirtualComponent comp = ComponentCore.createComponent(selected);
String path = selected.getName();
- String extension = ComponentUtils.getDefaultProjectExtension(comp);
+ String extension = ".jar";
path += extension;
getTaskModel().putObject(NewReferenceWizard.COMPONENT, comp);
16 years, 4 months
JBoss Tools SVN: r17169 - trunk/as/plugins.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-19 20:29:38 -0400 (Wed, 19 Aug 2009)
New Revision: 17169
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/
Log:
copying override.ui back into trunk since WTP slipped on getting our stuff into M1 and also since they will nto have a december release :(
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui (from rev 17168, workspace/rstryker/org.jboss.ide.eclipse.as.wtp.override.ui)
16 years, 4 months
JBoss Tools SVN: r17168 - trunk/seam/plugins/org.jboss.tools.seam.text.ext.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-08-19 18:52:10 -0400 (Wed, 19 Aug 2009)
New Revision: 17168
Modified:
trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml
Log:
JBIDE-3998: Make OpenOn work for testNG XML files opened in JBoss XML Editor.
Open-On is added for tag's attribute: <class name="..." />
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml 2009-08-19 22:43:24 UTC (rev 17167)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml 2009-08-19 22:52:10 UTC (rev 17168)
@@ -258,6 +258,22 @@
</partitionType>
</contentType>
</hyperlinkPartitioner>
+
+ <hyperlinkPartitioner
+ id="org.jboss.tools.seam.text.ext.hyperlink.TestNGHyperlinkPartitioner"
+ class="org.jboss.tools.common.text.ext.hyperlink.xml.XMLClassHyperlinkPartitioner">
+ <contentType id="org.eclipse.wst.xml.core.xmlsource">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="/suite/test/classes/class/name/" />
+ </partitionType>
+ </contentType>
+ <contentType id="org.eclipse.core.runtime.xml">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="/suite/test/classes/class/name/" />
+ </partitionType>
+ </contentType>
+
+ </hyperlinkPartitioner>
</extension>
<extension
16 years, 4 months
JBoss Tools SVN: r17167 - trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-08-19 18:43:24 -0400 (Wed, 19 Aug 2009)
New Revision: 17167
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/jira/browse/JBIDE-4124 fixed
exported packages adjusted for as.archives.integration.test plug-in to fix test execution exception
junit.framework.TestSuite
at org.eclipse.test.EclipseTestRunner.getTest(EclipseTestRunner.java:265)
at org.eclipse.test.EclipseTestRunner.<init>(EclipseTestRunner.java:220)
at org.eclipse.test.EclipseTestRunner.run(EclipseTestRunner.java:204)
at org.eclipse.test.UITestApplication$3.run(UITestApplication.java:195)
at org.eclipse.swt.widgets.RunnableLock.run(RunnableLock.java:35)
at org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:134)
at org.eclipse.swt.widgets.Display.runAsyncMessages(Display.java:3468)
at org.eclipse.swt.widgets.Display.readAndDispatch(Display.java:3115)
at org.eclipse.ui.internal.Workbench.runEventLoop(Workbench.java:2405)
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-INF/MANIFEST.MF 2009-08-19 17:19:51 UTC (rev 17166)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-INF/MANIFEST.MF 2009-08-19 22:43:24 UTC (rev 17167)
@@ -22,3 +22,4 @@
org.eclipse.jface;bundle-version="3.4.2",
org.jboss.tools.tests;bundle-version="2.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.jboss.ide.eclipse.as.archives.integration.test
16 years, 4 months
JBoss Tools SVN: r17166 - trunk/as/features/org.jboss.ide.eclipse.as.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-08-19 13:19:51 -0400 (Wed, 19 Aug 2009)
New Revision: 17166
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4124 fixed, org.jboss.ide.eclipse.as.archives.integration.test plug-in is included in as.test.feature to fix test execution error
Modified: trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 2009-08-19 16:31:58 UTC (rev 17165)
+++ trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 2009-08-19 17:19:51 UTC (rev 17166)
@@ -439,4 +439,10 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.ide.eclipse.as.archives.integration.test"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
16 years, 4 months
JBoss Tools SVN: r17165 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-08-19 12:31:58 -0400 (Wed, 19 Aug 2009)
New Revision: 17165
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4760
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2009-08-19 16:19:49 UTC (rev 17164)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractTagLib.java 2009-08-19 16:31:58 UTC (rev 17165)
@@ -208,6 +208,10 @@
if(libs[i]!=this && libs[i].getURI().equals(uri)) {
IComponent ac = libs[i].getComponent(component.getName());
if(ac!=null && !ac.isExtended()) {
+ String d = ac.getDescription();
+ if(d!=null && component instanceof AbstractComponent) {
+ ((AbstractComponent)component).setDescription(d);
+ }
return true;
}
}
16 years, 4 months
JBoss Tools SVN: r17164 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-08-19 12:19:49 -0400 (Wed, 19 Aug 2009)
New Revision: 17164
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4760
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java 2009-08-19 16:18:51 UTC (rev 17163)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/el/AbstractELCompletionEngine.java 2009-08-19 16:19:49 UTC (rev 17164)
@@ -243,9 +243,10 @@
}
}
}
- }
- if(prefixWasChanged) {
+ ELOperandResolveStatus oldElStatus = resolveELOperand(file, operand, returnEqualedVariablesOnly, false);
+ status.getProposals().addAll(oldElStatus.getProposals());
+
var.resolveValue("#{" + var.getElToken().getText() + suffix + "}"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -263,7 +264,6 @@
return status;
}
-
/**
* Returns MemberInfo for last segment of EL. Null if El is not resolved.
* @param seamProject
16 years, 4 months
JBoss Tools SVN: r17163 - trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-08-19 12:18:51 -0400 (Wed, 19 Aug 2009)
New Revision: 17163
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4760
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-08-19 14:56:24 UTC (rev 17162)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-08-19 16:18:51 UTC (rev 17163)
@@ -274,60 +274,63 @@
return unique.toArray(new ICompletionProposal[unique.size()]);
}
- private ICompletionProposal findExistingProposal(List<ICompletionProposal> proposals, ICompletionProposal proposal) {
+ private ICompletionProposal findExistingProposal(
+ List<ICompletionProposal> proposals, ICompletionProposal proposal) {
if (proposals == null || proposal == null)
return null;
for (ICompletionProposal existingProposal : proposals) {
String exReplString = null;
String exDispString = null;
- String exInfoString = null;
-
+
if (existingProposal instanceof CustomCompletionProposal) {
- exReplString = ((CustomCompletionProposal)existingProposal).getReplacementString();
+ exReplString = ((CustomCompletionProposal) existingProposal)
+ .getReplacementString();
}
exDispString = unQuote(existingProposal.getDisplayString());
- exInfoString = unQuote(existingProposal.getAdditionalProposalInfo());
- exReplString = getReplacementWord(exReplString == null ? exDispString : exReplString);
-
+ exReplString = getReplacementWord(exReplString == null ? exDispString
+ : exReplString);
+
String replString = null;
String dispString = null;
- String infoString = null;
-
+
if (proposal instanceof CustomCompletionProposal) {
- replString = ((CustomCompletionProposal)proposal).getReplacementString();
+ replString = ((CustomCompletionProposal) proposal)
+ .getReplacementString();
}
dispString = unQuote(proposal.getDisplayString());
- infoString = unQuote(proposal.getAdditionalProposalInfo());
- replString = getReplacementWord(replString == null ? dispString : replString);
-
- if (exReplString != null && replString != null &&
- (exReplString.equals(replString) ||
- exReplString.startsWith(replString) ||
- replString.startsWith(exReplString)))
+ replString = getReplacementWord(replString == null ? dispString
+ : replString);
+
+ if (exReplString != null && replString != null
+ && exReplString.equals(replString))
return existingProposal;
}
-
+
return null;
}
-
+
private String getReplacementWord(String replacement) {
- replacement = (replacement == null ?
- "" : //$NON-NLS-1$
- replacement);
- int index = replacement.indexOf('>'); //$NON-NLS-1$
+ replacement = (replacement == null ? "" : //$NON-NLS-1$
+ replacement);
+ int index = replacement.indexOf('>'); //$NON-NLS-1$
if (index != -1) {
replacement = replacement.substring(0, index).trim();
if (replacement.endsWith("/")) //$NON-NLS-1$
- replacement = replacement.substring(0, replacement.length() - 1).trim();
+ replacement = replacement
+ .substring(0, replacement.length() - 1).trim();
}
- index = replacement.indexOf('=');
+ index = replacement.indexOf("="); //$NON-NLS-1$
if (index != -1) {
replacement = replacement.substring(0, index).trim();
}
+ index = replacement.indexOf(" "); //$NON-NLS-1$
+ if (index != -1) {
+ replacement = replacement.substring(0, index).trim();
+ }
return replacement;
}
-
+
private String unQuote(String str) {
str = (str == null ?
"" : //$NON-NLS-1$
16 years, 4 months
JBoss Tools SVN: r17162 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context: java and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-08-19 10:56:24 -0400 (Wed, 19 Aug 2009)
New Revision: 17162
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4761
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java 2009-08-19 14:53:59 UTC (rev 17161)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.java 2009-08-19 14:56:24 UTC (rev 17162)
@@ -15,6 +15,7 @@
import org.eclipse.jpt.core.context.JoinColumn;
import org.eclipse.jpt.core.context.RelationshipMapping;
import org.eclipse.jpt.core.internal.context.MappingTools;
+import org.eclipse.jpt.db.Database;
import org.eclipse.jpt.db.Table;
import org.hibernate.cfg.NamingStrategy;
import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject;
@@ -99,12 +100,16 @@
NamingStrategy namingStrategy = ((HibernateJpaProject)targetEntity.getJpaProject()).getNamingStrategy();
if (namingStrategy != null){
- String logicalTargetColumnName = namingStrategy.logicalColumnName(targetColumnName, prefix);
+ String logicalTargetColumnName = null;
+ if (targetColumnName != null || prefix != null){
+ logicalTargetColumnName = namingStrategy.logicalColumnName(targetColumnName, prefix);
+ }
String name = namingStrategy.foreignKeyColumnName(prefix,
targetEntity.getPersistentType().getName(),
targetEntity.getPrimaryTableName(),
logicalTargetColumnName);
- return targetEntity.getPrimaryDbTable().getDatabase().convertNameToIdentifier(name);
+ Table t = targetEntity.getPrimaryDbTable();
+ return t != null ? t.getDatabase().convertNameToIdentifier(name) : name;
}
if (prefix == null) {
prefix = targetEntityName;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2009-08-19 14:53:59 UTC (rev 17161)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImpl.java 2009-08-19 14:56:24 UTC (rev 17162)
@@ -518,7 +518,10 @@
String name = ns.joinKeyColumnName(parentEntity.getPrimaryKeyColumnName(),
parentEntity.getPrimaryTableName());
- return parentEntity.getPrimaryDbTable().getDatabase().convertNameToIdentifier(name) ;
+ if (parentEntity.getPrimaryDbTable() != null){
+ return parentEntity.getPrimaryDbTable().getDatabase().convertNameToIdentifier(name);
+ }
+ return name ;
}
}
}
16 years, 4 months
JBoss Tools SVN: r17161 - in trunk/jst/plugins/org.jboss.tools.jst.jsp: src/org/jboss/tools/jst/jsp/contentassist and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-08-19 10:53:59 -0400 (Wed, 19 Aug 2009)
New Revision: 17161
Added:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/actions/
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/actions/EnableJSFCAOnProject.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/actions/KBProblemMarkerResolutionGenerator.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties
Log:
JBIDE-4770: The quick-fix is to be present to allow to specify the KB-nature and KB-builder on the project.
Issue is fixed.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-08-19 13:32:30 UTC (rev 17160)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2009-08-19 14:53:59 UTC (rev 17161)
@@ -531,10 +531,20 @@
</key>
</extension>
- <extension id="kbproblemmarker" name="%KBProblemName" point="org.eclipse.core.resources.markers">
+ <extension id="kbproblemmarker" name="%KBProblemName" point="org.eclipse.core.resources.markers">
<super type="org.eclipse.core.resources.problemmarker">
</super>
<persistent value="true">
</persistent>
+
</extension>
+
+ <extension point="org.eclipse.ui.ide.markerResolution">
+ <markerResolutionGenerator
+ markerType="org.jboss.tools.jst.jsp.kbproblemmarker"
+ class="org.jboss.tools.jst.jsp.contentassist.actions.KBProblemMarkerResolutionGenerator">
+ </markerResolutionGenerator>
+ </extension>
+
+
</plugin>
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-08-19 13:32:30 UTC (rev 17160)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-08-19 14:53:59 UTC (rev 17161)
@@ -164,12 +164,9 @@
private IMarker createOrUpdateKbProblemMarker(IMarker m, IResource r, boolean kbNatureIsAbsent, boolean kbBuilderIsAbsent) throws CoreException {
ArrayList<String> args = new ArrayList<String>();
- if (kbNatureIsAbsent) {
- args.add(JstUIMessages.KBNATURE_NOT_FOUND);
- }
- if (kbBuilderIsAbsent) {
- args.add(JstUIMessages.KBBUILDER_NOT_FOUND);
- }
+ args.add(kbNatureIsAbsent ? JstUIMessages.KBNATURE_NOT_FOUND : ""); //$NON-NLS-1$
+ args.add(kbBuilderIsAbsent ? JstUIMessages.KBBUILDER_NOT_FOUND : ""); //$NON-NLS-1$
+
String message = MessageFormat.format(JstUIMessages.KBPROBLEM, args.toArray());
if (m == null) m = r.createMarker(KB_PROBLEM_MARKER_TYPE);
m.setAttribute(IMarker.MESSAGE, message);
Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/actions/EnableJSFCAOnProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/actions/EnableJSFCAOnProject.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/actions/EnableJSFCAOnProject.java 2009-08-19 14:53:59 UTC (rev 17161)
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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.jsp.contentassist.actions;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.ui.IMarkerResolution;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.jst.jsp.JspEditorPlugin;
+import org.jboss.tools.jst.jsp.contentassist.AbstractXMLContentAssistProcessor;
+import org.jboss.tools.jst.jsp.messages.JstUIMessages;
+import org.jboss.tools.jst.web.kb.IKbProject;
+
+/**
+ * The Marker Resolution that enables the KB Nature on the project
+ *
+ * @author Victor Rubezhny
+ *
+ */
+public class EnableJSFCAOnProject implements IMarkerResolution{
+
+ public String getLabel() {
+ return JstUIMessages.ENABLE_KB;
+ }
+
+ public void run(IMarker marker) {
+ IResource resource = marker.getResource();
+ IProject project = resource instanceof IProject ? (IProject)resource :
+ resource != null ? resource.getProject() : null;
+
+ if (project == null)
+ return;
+
+ try {
+ EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID);
+ // Find existing KBNATURE problem marker and kill it if exists
+ project.deleteMarkers(AbstractXMLContentAssistProcessor.KB_PROBLEM_MARKER_TYPE, true, IResource.DEPTH_ONE);
+ } catch (CoreException e) {
+ JspEditorPlugin.getPluginLog().logError(e);
+ }
+ }
+
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/actions/EnableJSFCAOnProject.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/actions/KBProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/actions/KBProblemMarkerResolutionGenerator.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/actions/KBProblemMarkerResolutionGenerator.java 2009-08-19 14:53:59 UTC (rev 17161)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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.jsp.contentassist.actions;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.ui.IMarkerResolution;
+import org.eclipse.ui.IMarkerResolutionGenerator;
+
+/**
+ * Shows the Marker Resolutions for KB Problem Marker
+ *
+ * @author Victor Rubezhny
+ *
+ */
+public class KBProblemMarkerResolutionGenerator implements IMarkerResolutionGenerator {
+ public IMarkerResolution[] getResolutions(IMarker marker) {
+ return new IMarkerResolution[] {
+ new EnableJSFCAOnProject()
+ };
+ }
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/actions/KBProblemMarkerResolutionGenerator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java 2009-08-19 13:32:30 UTC (rev 17160)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/JstUIMessages.java 2009-08-19 14:53:59 UTC (rev 17161)
@@ -118,4 +118,5 @@
public static String KBNATURE_NOT_FOUND;
public static String KBBUILDER_NOT_FOUND;
public static String KBPROBLEM;
+ public static String ENABLE_KB;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2009-08-19 13:32:30 UTC (rev 17160)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/messages/messages.properties 2009-08-19 14:53:59 UTC (rev 17161)
@@ -96,3 +96,4 @@
KBNATURE_NOT_FOUND=KB Nature is not installed.
KBBUILDER_NOT_FOUND=KB Builder is not installed.
KBPROBLEM=KB Problem: {0} {1} Use Quick Fix to allow JSF Content Assistant.
+ENABLE_KB=Enable JSF CA on this project
16 years, 4 months