JBoss Tools SVN: r42781 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-07-30 09:10:37 -0400 (Mon, 30 Jul 2012)
New Revision: 42781
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/AddGeneratedClassesJob.java
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.properties
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizard.java
Log:
https://issues.jboss.org/browse/JBIDE-11883
Add newly generated entities to persistence.xml
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2012-07-30 12:47:18 UTC (rev 42780)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2012-07-30 13:10:37 UTC (rev 42781)
@@ -23,7 +23,9 @@
org.eclipse.persistence.jpa.jpql;bundle-version="1.0.0",
org.eclipse.jst.j2ee.core;bundle-version="1.2.100",
org.hibernate.eclipse.libs;bundle-version="3.4.0",
- org.eclipse.datatools.connectivity;bundle-version="1.2.5"
+ org.eclipse.datatools.connectivity;bundle-version="1.2.5",
+ org.eclipse.wst.common.emf;bundle-version="1.2.100",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.8.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.hibernate.jpt.core.internal,
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/AddGeneratedClassesJob.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/AddGeneratedClassesJob.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/AddGeneratedClassesJob.java 2012-07-30 13:10:37 UTC (rev 42781)
@@ -0,0 +1,165 @@
+/*******************************************************************************
+ * 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.jpt.core.internal.context;
+
+import java.util.List;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceRuleFactory;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.WorkspaceJob;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.SubMonitor;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jpt.common.utility.internal.CollectionTools;
+import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;
+import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
+import org.eclipse.jpt.jpa.core.JpaProject;
+import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef;
+import org.eclipse.jpt.jpa.core.context.persistence.Persistence;
+import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
+import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXml;
+import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory;
+import org.eclipse.jpt.jpa.core.resource.persistence.XmlJavaClassRef;
+import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence;
+import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit;
+import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource;
+
+/**
+ * @author Dmitry Geraskov (geraskov(a)gmail.com)
+ *
+ */
+public class AddGeneratedClassesJob extends WorkspaceJob {
+
+ private JpaProject jpaProject;
+
+ private List<IResource> javaFilesToAdd;
+
+ public AddGeneratedClassesJob(JpaProject jpaProject, List<IResource> javaFilesToAdd) {
+ super(Messages.SYNC_CLASSES_JOB);
+ IResourceRuleFactory ruleFactory = ResourcesPlugin.getWorkspace().getRuleFactory();
+ setRule(ruleFactory.modifyRule(jpaProject.getProject()));
+ this.jpaProject = jpaProject;
+ this.javaFilesToAdd = javaFilesToAdd;
+ }
+
+ @Override
+ public IStatus runInWorkspace(IProgressMonitor monitor) {
+ if (monitor.isCanceled()) {
+ return Status.CANCEL_STATUS;
+ }
+ final SubMonitor sm = SubMonitor.convert(monitor, Messages.SYNC_CLASSES_TASK, 20);
+ final JpaXmlResource resource = jpaProject.getPersistenceXmlResource();
+ if (resource == null) {
+ //the resource would only be null if the persistence.xml file had an invalid content type
+ return Status.OK_STATUS;
+ }
+ if (sm.isCanceled()) {
+ return Status.CANCEL_STATUS;
+ }
+ sm.worked(1);
+
+ XmlPersistence persistence = (XmlPersistence) resource.getRootObject();
+ XmlPersistenceUnit persistenceUnit;
+
+ if (persistence.getPersistenceUnits().size() > 0) {
+ persistenceUnit = persistence.getPersistenceUnits().get(0);
+ }
+ else {
+ persistenceUnit = PersistenceFactory.eINSTANCE.createXmlPersistenceUnit();
+ persistenceUnit.setName(jpaProject.getName());
+ persistence.getPersistenceUnits().add(persistenceUnit);
+ }
+ sm.worked(1);
+
+ IStatus status = addNewClassRefs(sm.newChild(17), jpaProject, persistenceUnit);
+
+ resource.save();
+ return status;
+ }
+
+ protected IStatus addNewClassRefs(IProgressMonitor monitor, JpaProject jpaProject, XmlPersistenceUnit persistenceUnit) {
+ Iterable<String> mappedClassNames = getMappedNewClassNames(jpaProject, '$');
+ final SubMonitor sm = SubMonitor.convert(monitor, CollectionTools.size(mappedClassNames));
+
+ for (String fullyQualifiedTypeName : mappedClassNames) {
+ if ( ! mappingFileContains(jpaProject, fullyQualifiedTypeName)) {
+ XmlJavaClassRef classRef = PersistenceFactory.eINSTANCE.createXmlJavaClassRef();
+ classRef.setJavaClass(fullyQualifiedTypeName);
+ persistenceUnit.getClasses().add(classRef);
+ }
+ if (sm.isCanceled()) {
+ return Status.CANCEL_STATUS;
+ }
+ sm.worked(1);
+ }
+ return Status.OK_STATUS;
+ }
+
+ protected Iterable<String> getMappedNewClassNames(final JpaProject jpaProject, final char enclosingTypeSeparator) {
+ return new TransformationIterable<IType, String>(
+ new FilteringIterable<IType>(
+ new TransformationIterable<String, IType>(
+ jpaProject.getMappedJavaSourceClassNames()) {
+ @Override
+ protected IType transform(String fullyQualifiedName) {
+ return AddGeneratedClassesJob.this.findType(jpaProject, fullyQualifiedName);
+ }
+ }){
+ @Override
+ protected boolean accept(IType o) {
+ for (IResource res : javaFilesToAdd) {
+ if (res.equals(o.getResource())){
+ return true;
+ }
+ }
+ return false;
+ }
+ }) {
+ @Override
+ protected String transform(IType jdtType) {
+ return jdtType.getFullyQualifiedName(enclosingTypeSeparator);
+ }
+ };
+ }
+
+ protected IType findType(JpaProject jpaProject, String typeName) {
+ try {
+ return jpaProject.getJavaProject().findType(typeName);
+ } catch (JavaModelException ex) {
+ return null; // ignore exception?
+ }
+ }
+
+ boolean mappingFileContains(JpaProject jpaProject, String fullyQualifiedTypeName) {
+ PersistenceXml persistenceXml = jpaProject.getRootContextNode().getPersistenceXml();
+ if (persistenceXml == null) {
+ return false;
+ }
+ Persistence persistence = persistenceXml.getPersistence();
+ if (persistence == null) {
+ return false;
+ }
+ if (persistence.getPersistenceUnitsSize() == 0) {
+ return false;
+ }
+ PersistenceUnit persistenceUnit = persistence.getPersistenceUnit(0);
+ for (MappingFileRef mappingFileRef : persistenceUnit.getMappingFileRefs()) {
+ if (mappingFileRef.getPersistentType(fullyQualifiedTypeName) != null) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java 2012-07-30 12:47:18 UTC (rev 42780)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java 2012-07-30 13:10:37 UTC (rev 42781)
@@ -45,5 +45,9 @@
public static final String NAME_CANT_BE_EMPTY = "NAME_CANT_BE_EMPTY";//$NON-NLS-1$
public static final String TYPE_DEF_DUPLICATE_NAME= "TYPE_DEF_DUPLICATE_NAME";//$NON-NLS-1$
+
+ public static final String SYNC_CLASSES_JOB = "SYNC_CLASSES_JOB";//$NON-NLS-1$
+
+ public static final String SYNC_CLASSES_TASK = "SYNC_CLASSES_TASK";//$NON-NLS-1$
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.properties 2012-07-30 12:47:18 UTC (rev 42780)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.properties 2012-07-30 13:10:37 UTC (rev 42781)
@@ -12,4 +12,6 @@
INCONSISTENT_TYPE_HIERARCHY = Type hierarchy of the type \"{0}\" is inconsistent
TYPE_CLASS_NOT_FOUND = Type class \"{0}\" could not be found.
NAME_CANT_BE_EMPTY = Name could not be empty.
-TYPE_DEF_DUPLICATE_NAME=Duplicate type definition named \"{0}\" defined in this persistence unit
\ No newline at end of file
+TYPE_DEF_DUPLICATE_NAME=Duplicate type definition named \"{0}\" defined in this persistence unit
+SYNC_CLASSES_JOB = Synchronizing generated classes
+SYNC_CLASSES_TASK = Synchronizing generated classes...
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizard.java 2012-07-30 12:47:18 UTC (rev 42780)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizard.java 2012-07-30 13:10:37 UTC (rev 42781)
@@ -10,15 +10,29 @@
******************************************************************************/
package org.jboss.tools.hibernate.jpt.ui.wizard;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
import org.hibernate.console.KnownConfigurations;
import org.hibernate.eclipse.launch.HibernateLaunchConstants;
import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject;
+import org.jboss.tools.hibernate.jpt.core.internal.context.AddGeneratedClassesJob;
import org.jboss.tools.hibernate.jpt.ui.HibernateJptUIPlugin;
import org.jboss.tools.hibernate.jpt.ui.internal.platform.HibernateJpaPlatformUi;
@@ -33,7 +47,6 @@
private GenerateEntitiesWizardPage initPage;
-
public GenerateEntitiesWizard( HibernateJpaProject jpaProject, IStructuredSelection selection) {
super();
this.jpaProject = jpaProject;
@@ -71,7 +84,18 @@
wc.setAttribute(HibernateLaunchConstants.ATTR_EXPORTERS + '.' + HibernateJpaPlatformUi.exporter_id + ".extension_id", //$NON-NLS-1$
HibernateLaunchConstants.ATTR_PREFIX + "hbm2java"); //$NON-NLS-1$
try {
+ NewJavaFilesListener rcl = new NewJavaFilesListener(jpaProject.getJavaProject());;
+ if (!jpaProject.discoversAnnotatedClasses()){
+ ResourcesPlugin.getWorkspace().addResourceChangeListener(rcl);
+ }
wc.launch(ILaunchManager.RUN_MODE, null);
+ if (!jpaProject.discoversAnnotatedClasses()){
+ ResourcesPlugin.getWorkspace().removeResourceChangeListener(rcl);
+ if (rcl.generatedJavaFiles.size() > 0){
+ AddGeneratedClassesJob job = new AddGeneratedClassesJob(jpaProject, rcl.generatedJavaFiles);
+ job.schedule();
+ }
+ }
} catch (CoreException e) {
HibernateJptUIPlugin.logException(e);
} finally{
@@ -84,3 +108,73 @@
}
}
+
+class NewJavaFilesListener implements IResourceChangeListener {
+
+ List<IResource> generatedJavaFiles = new LinkedList<IResource>();
+ private List<IPackageFragmentRoot> sourceRoots = new LinkedList<IPackageFragmentRoot>();
+
+ /**
+ * @param projectName
+ */
+ public NewJavaFilesListener(IJavaProject project) {
+ try {
+ IPackageFragmentRoot[] allPackageFragmentRoots = project.getAllPackageFragmentRoots();
+ for (int j = 0; j < allPackageFragmentRoots.length; j++) {
+ if (!allPackageFragmentRoots[j].isArchive()){
+ sourceRoots.add(allPackageFragmentRoots[j]);
+ }
+ }
+ } catch (JavaModelException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void resourceChanged(IResourceChangeEvent event) {
+ IResourceDelta delta = event.getDelta();
+ if (delta != null){
+ try {
+ delta.accept(new IResourceDeltaVisitor() {
+
+ @Override
+ public boolean visit(IResourceDelta delta) throws CoreException {
+ IResource resource = delta.getResource();
+ int type = resource.getType();
+ //we also have to consider projects we dependent on here!!!
+ if (type == IResource.ROOT
+ || type == IResource.PROJECT
+ || type == IResource.FOLDER)
+ return true;
+
+ if (resource instanceof IFile && delta.getKind() == IResourceDelta.ADDED) {
+ // see if this is it
+ IFile candidate = (IFile) resource;
+ if (isJavaSourceFile(candidate)) {
+ generatedJavaFiles.add(candidate);
+ }
+ }
+ return false;
+ }
+
+ private boolean isJavaSourceFile(IResource candidate) {
+ if (candidate.getName().endsWith(".java")){ //$NON-NLS-1$
+ while (candidate.getParent() != null){
+ for (IPackageFragmentRoot root : sourceRoots) {
+ if (root.getResource().equals(candidate.getParent())){
+ return true;
+ }
+ }
+ candidate = candidate.getParent();
+ }
+ }
+ return false;
+ }
+ });
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+}
11 years, 9 months
JBoss Tools SVN: r42780 - trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-07-30 08:47:18 -0400 (Mon, 30 Jul 2012)
New Revision: 42780
Modified:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java
Log:
Jenkins debugging
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java 2012-07-30 09:21:49 UTC (rev 42779)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CentralAllBotTests.java 2012-07-30 12:47:18 UTC (rev 42780)
@@ -9,7 +9,7 @@
BaseFunctionalityTest.class,
CreateProjectsWithServerTest.class,
// CreateProjectsWithoutServerTest.class
- DocumentationSectionTest.class
+// DocumentationSectionTest.class
// EmptyTestForHudson.class
// InstallTest.class
})
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-07-30 09:21:49 UTC (rev 42779)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-07-30 12:47:18 UTC (rev 42780)
@@ -36,9 +36,6 @@
util.closeAllViews();
SWTOpenExt open = new SWTOpenExt(bot);
open.preferenceOpen(Preference.create("Maven"));
- /*bot.menu("Window").menu("Preferences").click();
- bot.waitForShell("Preferences");
- bot.tree().getTreeItem("Maven").select();*/
bot.checkBox("Download repository index updates on startup").deselect();
bot.clickButton("OK");
bot.menu("Help").menu(IDELabel.JBossCentralEditor.JBOSS_CENTRAL).click();
11 years, 9 months
JBoss Tools SVN: r42779 - in workspace/yradtsevich/browsersim: org.jboss.tools.browsersim.app-ant and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-07-30 05:21:49 -0400 (Mon, 30 Jul 2012)
New Revision: 42779
Added:
workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/
workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/README.txt
workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/ant/
workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/ant/swtjar.jar
workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/build.properties
workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/build.xml
Log:
JBIDE-11493https://issues.jboss.org/browse/JBIDE-11493 : Create standalone BrowserSim application
- created ant script build standalone multiplatform BrowserSim application
Added: workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/README.txt
===================================================================
--- workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/README.txt (rev 0)
+++ workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/README.txt 2012-07-30 09:21:49 UTC (rev 42779)
@@ -0,0 +1,3 @@
+Ececute the following command to get standalone multiplatform BrowserSim:
+>ant checkoutThis getLib compile jar
+You suld get build/jar/org.jboss.tools.vpe.browsersim.app.jar
\ No newline at end of file
Added: workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/ant/swtjar.jar
===================================================================
(Binary files differ)
Property changes on: workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/ant/swtjar.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/build.properties
===================================================================
--- workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/build.properties (rev 0)
+++ workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/build.properties 2012-07-30 09:21:49 UTC (rev 42779)
@@ -0,0 +1,5 @@
+# -----------------------------------------------------------------------------
+# build.properties
+# This file is referenced by the build.xml file.
+# -----------------------------------------------------------------------------
+browsersim.this.url=http://anonsvn.jboss.org/repos/jbosstools/trunk/vpe/plugins
Added: workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/build.xml
===================================================================
--- workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/build.xml (rev 0)
+++ workspace/yradtsevich/browsersim/org.jboss.tools.browsersim.app-ant/build.xml 2012-07-30 09:21:49 UTC (rev 42779)
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<project name="org.jboss.tools.browsersim.app" basedir="." default="compile">
+ <!-- all properties are in build.properties -->
+ <property file="build.properties" />
+
+ <taskdef name="swtjar" classname="org.swtjar.ant.SWTJarTask" classpath="ant/swtjar.jar"/>
+
+ <target name="clean">
+ <!--delete dir="src"/-->
+ <!--delete dir="lib"/-->
+ <delete dir="build"/>
+ </target>
+
+ <target name="checkoutThis">
+ <exec executable="svn">
+ <arg value="co" />
+ <arg value="${browsersim.this.url}/org.jboss.tools.vpe.browsersim.browser" />
+ <arg value="src/org.jboss.tools.vpe.browsersim.browser" />
+ </exec>
+ <exec executable="svn">
+ <arg value="co" />
+ <arg value="${browsersim.this.url}/org.jboss.tools.vpe.browsersim" />
+ <arg value="src/org.jboss.tools.vpe.browsersim" />
+ </exec>
+ </target>
+ <target name="getLib">
+ <mkdir dir="lib"/>
+ <get dest="lib/swt-win32-3.7.2.v3740f.jar">
+ <url url="http://mirrors.med.harvard.edu/eclipse//eclipse/updates/3.7/R-3.7.2-20120..."/>
+ </get>
+ <get dest="lib/swt-linux32-3.7.2.v3740f.jar">
+ <url url="http://mirrors.med.harvard.edu/eclipse//eclipse/updates/3.7/R-3.7.2-20120..."/>
+ </get>
+ <get dest="lib/swt-linux64-3.7.2.v3740f.jar">
+ <url url="http://mirrors.med.harvard.edu/eclipse//eclipse/updates/3.7/R-3.7.2-20120..."/>
+ </get>
+ <get dest="lib/swt-osx64-3.7.2.v3740f.jar">
+ <url url="http://mirrors.med.harvard.edu/eclipse//eclipse/updates/3.7/R-3.7.2-20120..."/>
+ </get>
+ </target>
+
+ <target name="compile">
+ <mkdir dir="build/classes"/>
+ <path id="lib.path.ref">
+ <pathelement location="lib/swt-win32-3.7.2.v3740f.jar"/>
+ </path>
+ <path id="src.path.ref">
+ <pathelement path="src/org.jboss.tools.vpe.browsersim.browser/src"/>
+ <pathelement path="src/org.jboss.tools.vpe.browsersim/src"/>
+ </path>
+ <javac destdir="build/classes" compiler="javac1.6" classpath="${toString:lib.path.ref}" includeantruntime="false">
+ <src refid="src.path.ref"/>
+ </javac>
+ <copy todir="build/classes">
+ <fileset dir="src/org.jboss.tools.vpe.browsersim.browser/src">
+ <exclude name="**/*.java"/>
+ </fileset>
+ <fileset dir="src/org.jboss.tools.vpe.browsersim/src">
+ <exclude name="**/*.java"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="jar">
+ <mkdir dir="build/jar"/>
+ <!-- Package cross platform SWT Jar -->
+ <swtjar jarfile="build/jar/org.jboss.tools.vpe.browsersim.app.jar" targetmainclass="org.jboss.tools.vpe.browsersim.ui.BrowserSim" swtversion="3.7.2.v3740f">
+ <!-- Application Classes -->
+ <fileset dir="build/classes" includes="**/*" />
+ <!-- SWT Jars -->
+ <fileset dir="lib" includes="swt-*.jar" />
+ </swtjar>
+ </target>
+
+ <target name="run">
+ <java jar="build/jar/org.jboss.tools.vpe.browsersim.app.jar" fork="true"/>
+ </target>
+
+</project>
11 years, 9 months
JBoss Tools SVN: r42778 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse: console/properties and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-07-30 05:18:26 -0400 (Mon, 30 Jul 2012)
New Revision: 42778
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java
Log:
https://issues.jboss.org/browse/JBIDE-12343
Check project for jpa facet instead of actual build
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2012-07-30 08:27:35 UTC (rev 42777)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2012-07-30 09:18:26 UTC (rev 42778)
@@ -17,8 +17,8 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jpt.jpa.core.JpaDataSource;
-import org.eclipse.jpt.jpa.core.JpaProject;
+import org.eclipse.jpt.jpa.core.JpaFacet;
+import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
import org.eclipse.osgi.util.NLS;
import org.hibernate.console.ConnectionProfileUtil;
import org.hibernate.console.HibernateConsoleRuntimeException;
@@ -26,6 +26,7 @@
import org.hibernate.eclipse.console.utils.ClassLoaderHelper;
import org.hibernate.eclipse.console.utils.DriverClassHelpers;
import org.hibernate.eclipse.launch.IConsoleConfigurationLaunchConstants;
+import org.hibernate.util.xpl.StringHelper;
import org.w3c.dom.Element;
public class EclipseLaunchConsoleConfigurationPreferences implements ConsoleConfigurationPreferences {
@@ -142,12 +143,11 @@
if (projName != null){
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
if (project != null){
- JpaProject jpaProject = (JpaProject) project.getAdapter(JpaProject.class);
- if (jpaProject != null) {
- JpaDataSource ds = jpaProject.getDataSource();
- if (ds != null)
- return "".equals(ds.getConnectionProfileName()) ? null : ds.getConnectionProfileName();//$NON-NLS-1$
+ if (!JpaFacet.isInstalled(project)) {
+ return null;
}
+ String projectCPName = JptJpaCorePlugin.getConnectionProfileName(project);
+ return StringHelper.isEmpty(projectCPName) ? null : projectCPName;
}
}
}
@@ -225,16 +225,17 @@
if (projName != null){
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
if (project != null){
- JpaProject jpaProject = (JpaProject) project.getAdapter(JpaProject.class);
- if (jpaProject != null) {
- if (jpaProject.getUserOverrideDefaultCatalog() != null){
- prop.put("hibernate.default_catalog", jpaProject.getUserOverrideDefaultCatalog()); //$NON-NLS-1$
- }
- if (jpaProject.getUserOverrideDefaultSchema() != null){
- prop.put("hibernate.default_schema", jpaProject.getUserOverrideDefaultSchema()); //$NON-NLS-1$
- }
-
+ if (!JpaFacet.isInstalled(project)) {
+ return null;
}
+ String defCatalog = JptJpaCorePlugin.getUserOverrideDefaultCatalog(project);
+ String defSchema = JptJpaCorePlugin.getUserOverrideDefaultSchema(project);
+ if (StringHelper.isNotEmpty(defCatalog)){
+ prop.put("hibernate.default_catalog", defCatalog); //$NON-NLS-1$
+ }
+ if (StringHelper.isNotEmpty(defSchema)){
+ prop.put("hibernate.default_schema", defSchema); //$NON-NLS-1$
+ }
}
}
return prop.size() == 0 ? null : prop;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java 2012-07-30 08:27:35 UTC (rev 42777)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java 2012-07-30 09:18:26 UTC (rev 42778)
@@ -43,7 +43,9 @@
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jpt.jpa.core.JpaFacet;
import org.eclipse.jpt.jpa.core.JpaProject;
+import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -283,9 +285,13 @@
}
private boolean isHibernateJpaProject(){
- JpaProject jpaProject = (JpaProject) getProject().getAdapter(JpaProject.class);
- return (jpaProject != null) && ((jpaProject.getJpaPlatform().getId().equals(HibernatePropertiesConstants.HIBERNATE_JPA_PLATFORM_ID))
- || (jpaProject.getJpaPlatform().getId().equals(HibernatePropertiesConstants.HIBERNATE_JPA2_0_PLATFORM_ID)));
+ IProject project = getProject();
+ if (!JpaFacet.isInstalled(project)) {
+ return false;
+ }
+ String jpaPlatformId = JptJpaCorePlugin.getJpaPlatformId(project);
+ return HibernatePropertiesConstants.HIBERNATE_JPA_PLATFORM_ID.equals(jpaPlatformId)
+ || HibernatePropertiesConstants.HIBERNATE_JPA2_0_PLATFORM_ID.equals(jpaPlatformId);
}
private IProject getProject() {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java 2012-07-30 08:27:35 UTC (rev 42777)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java 2012-07-30 09:18:26 UTC (rev 42778)
@@ -6,9 +6,7 @@
import java.util.Collections;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@@ -25,8 +23,8 @@
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jpt.jpa.core.JpaDataSource;
-import org.eclipse.jpt.jpa.core.JpaProject;
+import org.eclipse.jpt.jpa.core.JpaFacet;
+import org.eclipse.jpt.jpa.core.JptJpaCorePlugin;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -445,13 +443,12 @@
}
if (ConnectionProfileCtrl.JPA_CONNECTIN_NAME.equals(cpName)){
- JpaProject jpaProject = (JpaProject) findJavaProject.getProject().getAdapter(JpaProject.class);
- if (jpaProject == null){
+ if (!JpaFacet.isInstalled(findJavaProject.getProject())) {
setErrorMessage(NLS.bind(HibernateConsoleMessages.ConsoleConfigurationMainTab_project_must_be_jpa, getProjectName()));
return false;
}
- JpaDataSource ds = jpaProject.getDataSource();
- if (ds == null || "".equals(ds.getConnectionProfileName())){ //$NON-NLS-1$
+ String projectCPName = JptJpaCorePlugin.getConnectionProfileName(findJavaProject.getProject());
+ if (StringHelper.isEmpty(projectCPName)){
setErrorMessage(NLS.bind(HibernateConsoleMessages.ConsoleConfigurationMainTab_cp_not_specified, getProjectName()));
return false;
}
11 years, 9 months
JBoss Tools SVN: r42777 - trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-07-30 04:27:35 -0400 (Mon, 30 Jul 2012)
New Revision: 42777
Modified:
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml
Log:
debug profile added freemarker ui bot test pom.xml and parent version updated
Modified: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml 2012-07-30 08:11:35 UTC (rev 42776)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml 2012-07-30 08:27:35 UTC (rev 42777)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.freemarker</groupId>
<artifactId>tests</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.freemarker.tests</groupId>
<artifactId>org.jboss.tools.freemarker.ui.bot.test</artifactId>
@@ -13,6 +13,15 @@
<packaging>eclipse-test-plugin</packaging>
+ <profiles>
+ <profile>
+ <id>mvn-debug</id>
+ <properties>
+ <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y</systemProperties>
+ </properties>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
11 years, 9 months
JBoss Tools SVN: r42776 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-07-30 04:11:35 -0400 (Mon, 30 Jul 2012)
New Revision: 42776
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch
Log:
Created launcher for EAP compatibility tests
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch 2012-07-30 08:11:35 UTC (rev 42776)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":${string_prompt:display number:0}"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.ide.eclipse.as.ui.bot.test.EAPCompatibilitySuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:"Please choose a SWTBot configuration file":${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files} -Xmx1024m -XX:MaxPermSize=256m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
11 years, 9 months
JBoss Tools SVN: r42775 - in trunk: jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-07-27 19:56:03 -0400 (Fri, 27 Jul 2012)
New Revision: 42775
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java
Log:
https://issues.jboss.org/browse/JBIDE-12353 Deadlock when invoking code completion
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java 2012-07-27 23:41:51 UTC (rev 42774)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/ca/BeansXmlCompletionProposalComputer.java 2012-07-27 23:56:03 UTC (rev 42775)
@@ -106,7 +106,7 @@
int replacementLength = matchString.length();
int cursorPosition = getCursorPositionForProposedText(replacementString);
Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
- if (image == null) {
+ if (textProposal.getImageDescriptor() == null) {
image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2012-07-27 23:41:51 UTC (rev 42774)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2012-07-27 23:56:03 UTC (rev 42775)
@@ -141,7 +141,7 @@
int replacementLength = contentAssistRequest.getReplacementLength();
int cursorPosition = getCursorPositionForProposedText(replacementString);
Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
- if (image == null) {
+ if (textProposal.getImageDescriptor() == null) {
image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE);
}
@@ -416,7 +416,7 @@
int replacementLength = query.length();
int cursorPosition = getCursorPositionForProposedText(replacementString);
Image image = CommonUIPlugin.getImageDescriptorRegistry().get(textProposal.getImageDescriptor());
- if (image == null) {
+ if(textProposal.getImageDescriptor()==null) {
image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
}
11 years, 9 months
JBoss Tools SVN: r42774 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-07-27 19:41:51 -0400 (Fri, 27 Jul 2012)
New Revision: 42774
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java
Log:
Make Quick Fix "Add tag library definition" work with KB Model instead of using plain tag library list https://issues.jboss.org/browse/JBIDE-12304
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java 2012-07-27 23:26:51 UTC (rev 42773)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java 2012-07-27 23:41:51 UTC (rev 42774)
@@ -11,7 +11,6 @@
package org.jboss.tools.jst.web.ui.action;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -55,18 +54,6 @@
private static final String UNKNOWN_TAG = "Unknown tag"; //$NON-NLS-1$
- public static HashMap<String, String> libs = new HashMap<String, String>();
- static{
- libs.put("s", "http://jboss.com/products/seam/taglib"); //$NON-NLS-1$//$NON-NLS-2$
- libs.put("ui", "http://java.sun.com/jsf/facelets"); //$NON-NLS-1$ //$NON-NLS-2$
- libs.put("f", "http://java.sun.com/jsf/core"); //$NON-NLS-1$ //$NON-NLS-2$
- libs.put("h", "http://java.sun.com/jsf/html"); //$NON-NLS-1$ //$NON-NLS-2$
- libs.put("rich", "http://richfaces.org/rich"); //$NON-NLS-1$ //$NON-NLS-2$
- libs.put("a4j", "http://richfaces.org/a4j"); //$NON-NLS-1$ //$NON-NLS-2$
- libs.put("a", "http://richfaces.org/a4j"); //$NON-NLS-1$ //$NON-NLS-2$
- libs.put("c", "http://java.sun.com/jstl/core"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
@Override
public IMarkerResolution[] getResolutions(IMarker marker) {
try{
@@ -130,14 +117,12 @@
List<ITagLibrary> libraries = kbProject.getAllTagLibraries();
ArrayList<String> names = new ArrayList<String>();
- boolean worked = false;
for(ITagLibrary l : libraries){
if(l instanceof TLDLibrary){
((TLDLibrary) l).createDefaultNameSpace();
}
INameSpace ns = l.getDefaultNameSpace();
if(ns != null && ns.getPrefix() != null && ns.getPrefix().equals(prefix)){
- worked = true;
String uri = ns.getURI();
String resolutionName = getResolutionName(xmlDocument != null && xmlDocument.isXMLType(), true, prefix, uri);
if(resolutionName != null && !names.contains(resolutionName) && l.getComponent(tagName) != null){
@@ -147,13 +132,19 @@
}
}
- if(proposals.size() == 0 && libs.containsKey(prefix) && !worked){
- String uri = libs.get(prefix);
+ for(ITagLibrary l : libraries){
+ INameSpace ns = l.getDefaultNameSpace();
+ if(ns != null && ns.getPrefix() != null && ns.getPrefix().equals(prefix))
+ continue;
+
+ String uri = l.getURI();
String resolutionName = getResolutionName(xmlDocument != null && xmlDocument.isXMLType(), true, prefix, uri);
- if(resolutionName != null){
+ if(resolutionName != null && !names.contains(resolutionName) && l.getComponent(tagName) != null){
proposals.add(new AddTLDMarkerResolution(resolutionName, start, end, uri, prefix));
+ names.add(resolutionName);
}
}
+
}
return proposals.toArray(new IJavaCompletionProposal[]{});
@@ -213,14 +204,12 @@
List<ITagLibrary> libraries = kbProject.getAllTagLibraries();
ArrayList<String> names = new ArrayList<String>();
- boolean worked = false;
for(ITagLibrary l : libraries){
if(l instanceof TLDLibrary){
((TLDLibrary) l).createDefaultNameSpace();
}
INameSpace ns = l.getDefaultNameSpace();
if(ns != null && ns.getPrefix() != null && ns.getPrefix().equals(prefix)){
- worked = true;
String uri = ns.getURI();
String resolutionName = getResolutionName(marker.getType().equals(HTML_VALIDATOR_MARKER) || marker.isSubtypeOf(HTML_VALIDATOR_MARKER), marker.getType().equals(JSP_VALIDATOR_MARKER) || marker.isSubtypeOf(JSP_VALIDATOR_MARKER), prefix, uri);
if(resolutionName != null && !names.contains(resolutionName) && l.getComponent(tagName) != null){
@@ -229,14 +218,19 @@
}
}
}
-
- if(resolutions.size() == 0 && libs.containsKey(prefix) && !worked){
- String uri = libs.get(prefix);
+ for(ITagLibrary l : libraries){
+ INameSpace ns = l.getDefaultNameSpace();
+ if(ns != null && ns.getPrefix() != null && ns.getPrefix().equals(prefix))
+ continue;
+
+ String uri = l.getURI();
String resolutionName = getResolutionName(marker.getType().equals(HTML_VALIDATOR_MARKER) || marker.isSubtypeOf(HTML_VALIDATOR_MARKER), marker.getType().equals(JSP_VALIDATOR_MARKER) || marker.isSubtypeOf(JSP_VALIDATOR_MARKER), prefix, uri);
- if(resolutionName != null){
+ if(resolutionName != null && !names.contains(resolutionName) && l.getComponent(tagName) != null){
resolutions.add(new AddTLDMarkerResolution(file, resolutionName, start, end, uri, prefix));
+ names.add(resolutionName);
}
}
+
return resolutions.toArray(new IMarkerResolution[]{});
}
11 years, 9 months
JBoss Tools SVN: r42773 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-07-27 19:26:51 -0400 (Fri, 27 Jul 2012)
New Revision: 42773
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/LibraryStorage.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java
Log:
https://issues.jboss.org/browse/JBIDE-12373 Update RequiredExecutionEnvironment to Java 1.6 for Common/CDI/Seam/JSF components
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/LibraryStorage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/LibraryStorage.java 2012-07-27 23:26:37 UTC (rev 42772)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/LibraryStorage.java 2012-07-27 23:26:51 UTC (rev 42773)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.jst.web.kb.internal;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -50,8 +52,10 @@
return allLibrariesArray;
}
- synchronized Set<ITagLibrary> getAllLibraries() {
- return allLibraries;
+ synchronized Collection<ITagLibrary> getAllLibraries() {
+ Collection<ITagLibrary> collection = new ArrayList<ITagLibrary>();
+ collection.addAll(allLibraries);
+ return collection;
}
public synchronized ITagLibrary[] getLibrariesArray(String uri) {
@@ -82,15 +86,18 @@
return result;
}
- public synchronized void addLibrary(ITagLibrary f) {
+ public void addLibrary(ITagLibrary f) {
+ addLibrary(f, f.getSourcePath());
+ }
+
+ public synchronized void addLibrary(ITagLibrary f, IPath sourcePath) {
allLibraries.add(f);
allLibrariesArray = EMPTY_LIB_ARRAY;
- IPath path = f.getSourcePath();
- if(path != null) {
- Set<ITagLibrary> fs = librariesBySource.get(path);
+ if(sourcePath != null) {
+ Set<ITagLibrary> fs = librariesBySource.get(sourcePath);
if(fs == null) {
fs = new HashSet<ITagLibrary>();
- librariesBySource.put(path, fs);
+ librariesBySource.put(sourcePath, fs);
}
fs.add(f);
}
@@ -105,16 +112,19 @@
}
public synchronized void removeLibrary(ITagLibrary f) {
+ removeLibrary(f, f.getSourcePath());
+ }
+
+ public synchronized void removeLibrary(ITagLibrary f, IPath sourcePath) {
allLibraries.remove(f);
allLibrariesArray = EMPTY_LIB_ARRAY;
- IPath path = f.getSourcePath();
- if(path != null) {
- Set<ITagLibrary> fs = librariesBySource.get(path);
+ if(sourcePath != null) {
+ Set<ITagLibrary> fs = librariesBySource.get(sourcePath);
if(fs != null) {
fs.remove(f);
}
if(fs.isEmpty()) {
- librariesBySource.remove(path);
+ librariesBySource.remove(sourcePath);
}
}
String uri = f.getURI();
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java 2012-07-27 23:26:37 UTC (rev 42772)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/StaticLibraries.java 2012-07-27 23:26:51 UTC (rev 42773)
@@ -66,7 +66,7 @@
LoadedDeclarations ds = scanner.parse(fo, new Path(file.getAbsolutePath()), null);
List<ITagLibrary> ls = ds.getLibraries();
for (ITagLibrary l : ls) {
- libraries.addLibrary(l);
+ libraries.addLibrary(l, new Path(file.getAbsolutePath()));
}
}
}
11 years, 9 months
JBoss Tools SVN: r42772 - in trunk/jst/plugins: org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-07-27 19:26:37 -0400 (Fri, 27 Jul 2012)
New Revision: 42772
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java
Log:
https://issues.jboss.org/browse/JBIDE-12373 Update RequiredExecutionEnvironment to Java 1.6 for Common/CDI/Seam/JSF components
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2012-07-27 23:15:40 UTC (rev 42771)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbProject.java 2012-07-27 23:26:37 UTC (rev 42772)
@@ -116,7 +116,7 @@
*/
@Override
public List<ITagLibrary> getAllTagLibraries() {
- Set<ITagLibrary> libs = libraries.getAllLibraries();
+ Collection<ITagLibrary> libs = libraries.getAllLibraries();
List<ITagLibrary> result = StaticLibraries.instance.getAllTagLibraries();
result.addAll(libs);
return result;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java 2012-07-27 23:15:40 UTC (rev 42771)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/JSPProblemMarkerResolutionGenerator.java 2012-07-27 23:26:37 UTC (rev 42772)
@@ -128,7 +128,7 @@
IKbProject kbProject = KbProjectFactory.getKbProject(file.getProject(), true);
- ITagLibrary[] libraries = kbProject.getTagLibraries();
+ List<ITagLibrary> libraries = kbProject.getAllTagLibraries();
ArrayList<String> names = new ArrayList<String>();
boolean worked = false;
for(ITagLibrary l : libraries){
@@ -211,7 +211,7 @@
IKbProject kbProject = KbProjectFactory.getKbProject(file.getProject(), true);
- ITagLibrary[] libraries = kbProject.getTagLibraries();
+ List<ITagLibrary> libraries = kbProject.getAllTagLibraries();
ArrayList<String> names = new ArrayList<String>();
boolean worked = false;
for(ITagLibrary l : libraries){
11 years, 9 months