JBoss Tools SVN: r4356 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-18 20:33:29 -0400 (Thu, 18 Oct 2007)
New Revision: 4356
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1000
now it copies the driver jar file to <<JBossHome>>/server/<<configuration>>/lib dir
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-10-19 00:07:42 UTC (rev 4355)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-10-19 00:33:29 UTC (rev 4356)
@@ -341,10 +341,6 @@
project.getLocation().toFile(),
hibernateDialectFilterSet, true);
- // Copy JDBC driver if there is any
- if(model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH)!=null)
- AntCopyUtils.copyFiles((String[])model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH), webLibFolder);
-
WtpUtils.setClasspathEntryAsExported(project, new Path("org.eclipse.jst.j2ee.internal.web.container"), monitor); //$NON-NLS-1$
Job create = new DataSourceXmlDeployer(project);
@@ -459,11 +455,6 @@
AntCopyUtils.copyFiles(seamLibFolder,earContentsFolder,new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)));
AntCopyUtils.copyFiles(seamGenResFolder,earContentsFolder,new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamGenResFolder)));
-
-
- if(model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH)!=null)
- AntCopyUtils.copyFiles((String[])model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH), earContentsFolder);
-
try {
File[] earJars = earContentsFolder.listFiles(new FilenameFilter() {
@@ -500,41 +491,26 @@
createSeamProjectPreferenes(project, model);
-// try {
- EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
- project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
- String wsPath = project.getLocation().removeLastSegments(1)
- .toFile().getAbsoluteFile().getPath();
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
+ EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
+ project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+ String wsPath = project.getLocation().removeLastSegments(1)
+ .toFile().getAbsoluteFile().getPath();
- if(!isWarConfiguration(model)) {
-// ResourcesUtils.importProject(
-// wsPath+"/"+project.getName()+"-ejb", monitor); //$NON-NLS-1$ //$NON-NLS-2$
-
- IProject ejbProjectToBeImported = wsRoot.getProject(project.getName()+"-ejb");
- ResourcesUtils.importExistingProject(ejbProjectToBeImported, wsPath+"/"+project.getName()+"-ejb", project.getName()+"-ejb");
-
-// ResourcesUtils.importProject(
-// wsPath+"/"+project.getName()+"-ear", monitor); //$NON-NLS-1$ //$NON-NLS-2$
+ IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- IProject earProjectToBeImported = wsRoot.getProject(project.getName()+"-ear");
- ResourcesUtils.importExistingProject(earProjectToBeImported, wsPath+"/"+project.getName()+"-ear", project.getName()+"-ear");
- }
+ if(!isWarConfiguration(model)) {
-// ResourcesUtils.importProject(
-// wsPath+"/"+project.getName()+"-test", monitor); //$NON-NLS-1$ //$NON-NLS-2$
-
- IProject testProjectToBeImported = wsRoot.getProject(project.getName()+"-test");
- ResourcesUtils.importExistingProject(testProjectToBeImported, wsPath+"/"+project.getName()+"-test", project.getName()+"-test");
+ IProject ejbProjectToBeImported = wsRoot.getProject(project.getName()+"-ejb");
+ ResourcesUtils.importExistingProject(ejbProjectToBeImported, wsPath+"/"+project.getName()+"-ejb", project.getName()+"-ejb");
-// } catch (IOException e) {
-// SeamCorePlugin.getPluginLog().logError(e);
-// } catch (InvocationTargetException e) {
-// SeamCorePlugin.getPluginLog().logError(e);
-// } catch (InterruptedException e) {
-// SeamCorePlugin.getPluginLog().logError(e);
-// }
+ IProject earProjectToBeImported = wsRoot.getProject(project.getName()+"-ear");
+ ResourcesUtils.importExistingProject(earProjectToBeImported, wsPath+"/"+project.getName()+"-ear", project.getName()+"-ear");
+ }
+
+ IProject testProjectToBeImported = wsRoot.getProject(project.getName()+"-test");
+ ResourcesUtils.importExistingProject(testProjectToBeImported, wsPath+"/"+project.getName()+"-test", project.getName()+"-test");
+
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java 2007-10-19 00:07:42 UTC (rev 4355)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPostInstallDelegate.java 2007-10-19 00:33:29 UTC (rev 4356)
@@ -20,6 +20,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
@@ -33,6 +34,7 @@
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.tools.jst.web.server.RegistrationHelper;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.osgi.service.prefs.BackingStoreException;
@@ -49,42 +51,15 @@
*/
public void execute(final IProject project, IProjectFacetVersion fv,
Object config, IProgressMonitor monitor) throws CoreException {
- IEclipsePreferences prefs = SeamCorePlugin.getSeamPreferences(project);
final IDataModel model = (IDataModel)config;
-
- prefs.put(JBOSS_AS_DEPLOY_AS, model.getProperty(JBOSS_AS_DEPLOY_AS).toString());
-
- prefs.put(SEAM_RUNTIME_NAME, model.getProperty(SEAM_RUNTIME_NAME).toString());
-
- prefs.put(SEAM_CONNECTION_PROFILE,model.getProperty(SEAM_CONNECTION_PROFILE).toString());
-
- prefs.put(SESION_BEAN_PACKAGE_NAME, model.getProperty(SESION_BEAN_PACKAGE_NAME).toString());
-
- prefs.put(ENTITY_BEAN_PACKAGE_NAME, model.getProperty(ENTITY_BEAN_PACKAGE_NAME).toString());
-
- prefs.put(TEST_CASES_PACKAGE_NAME, model.getProperty(TEST_CASES_PACKAGE_NAME).toString());
- prefs.put(SEAM_TEST_PROJECT,
- model.getProperty(SEAM_TEST_PROJECT)==null?
- "":model.getProperty(SEAM_TEST_PROJECT).toString()); //$NON-NLS-1$
-
- if(DEPLOY_AS_EAR.equals(model.getProperty(JBOSS_AS_DEPLOY_AS))) {
- prefs.put(SEAM_EJB_PROJECT,
- model.getProperty(SEAM_EJB_PROJECT)==null?
- "":model.getProperty(SEAM_EJB_PROJECT).toString()); //$NON-NLS-1$
-
- prefs.put(SEAM_EAR_PROJECT,
- model.getProperty(SEAM_EAR_PROJECT)==null?
- "":model.getProperty(SEAM_EAR_PROJECT).toString()); //$NON-NLS-1$
- }
-
- try {
- prefs.flush();
- } catch (BackingStoreException e) {
- SeamCorePlugin.getPluginLog().logError(e);
- }
-
IServer server = (IServer)model.getProperty(JBOSS_AS_TARGET_SERVER);
+ JBossServer jbs = (JBossServer)server.loadAdapter(JBossServer.class, new NullProgressMonitor());
+ if( jbs != null ) {
+ String[] driverJars = (String[])model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH);
+ String configFolder = jbs.getConfigDirectory();
+ AntCopyUtils.copyFiles(driverJars, new File(configFolder,"lib"));
+ }
if (server != null) {
RegistrationHelper.runRegisterInServerJob(project, server);
}
17 years, 2 months
JBoss Tools SVN: r4355 - trunk/seam/plugins/org.jboss.tools.seam.xml.ui/images.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2007-10-18 20:07:42 -0400 (Thu, 18 Oct 2007)
New Revision: 4355
Added:
trunk/seam/plugins/org.jboss.tools.seam.xml.ui/images/seam16.png
Removed:
trunk/seam/plugins/org.jboss.tools.seam.xml.ui/images/seam16.png
Log:
http://jira.jboss.org/jira/browse/JBIDE-1030
Icons for Seam Components View, Seam Perspective and Seam New actions have been updated
Deleted: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/images/seam16.png
===================================================================
(Binary files differ)
Added: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/images/seam16.png
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/images/seam16.png (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/images/seam16.png 2007-10-19 00:07:42 UTC (rev 4355)
@@ -0,0 +1,10 @@
+�PNG
+
+
+IHDR
+*b�QQ�UQ ��vp�!~ı��� � k@�DW|ґ�{�wνW��(UU�9��{��'. :��e��v��J�T$��A�����Cr���TMi����Ã}�s���< k�CT� ��m�{�]����w�E� ���u\� XL�I��
+�����,H ~7�[�-fT�� ;ɚM'�d�`�� z��w ���+?�?:}��s�-U5�>��'�u��/��d
+yج Z�&z�N�$
+�J:��ȆJU�j_zOn�b��T����H��ȕ*ps \\'<n�z}��?O(��L���,��v w�Q{����Y�He� Q��b�>�
+�� J2:m�#[�Œ��"0-�a���@���j��j �C���w5�� �*hU�(ڀ�ߏ�],8��b���rj�)���!7 � O8읈,<�a��T��f'�)��X~����m�M3�0�,�I���L���W �,�n'��oUA�ߢ���A�X���_�
+�� 8�n=/kV� k:��;Lz�F����O t�'���
\ No newline at end of file
17 years, 2 months
JBoss Tools SVN: r4353 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-10-18 19:20:34 -0400 (Thu, 18 Oct 2007)
New Revision: 4353
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
JBIDE-1114
Added a few more containers to ignore
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2007-10-18 22:16:56 UTC (rev 4352)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2007-10-18 23:20:34 UTC (rev 4353)
@@ -415,5 +415,17 @@
<filteredClasspathContainer
containerID="org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeInitializer">
</filteredClasspathContainer>
+ <filteredClasspathContainer
+ containerID="org.jboss.ide.eclipse.as.classpath.core.ejb3.classpathContainer">
+ </filteredClasspathContainer>
+ <filteredClasspathContainer
+ containerID="org.jboss.ide.eclipse.as.classpath.core.j2ee-1.3">
+ </filteredClasspathContainer>
+ <filteredClasspathContainer
+ containerID="org.jboss.ide.eclipse.as.classpath.core.j2ee-1.4">
+ </filteredClasspathContainer>
+ <filteredClasspathContainer
+ containerID="org.jboss.ide.eclipse.as.classpath.core.javaee-5.0">
+ </filteredClasspathContainer>
</extension>
</plugin>
17 years, 2 months
JBoss Tools SVN: r4352 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-10-18 18:16:56 -0400 (Thu, 18 Oct 2007)
New Revision: 4352
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
Log:
JBIDE-1117
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2007-10-18 18:55:36 UTC (rev 4351)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2007-10-18 22:16:56 UTC (rev 4352)
@@ -82,9 +82,20 @@
this.delta = delta;
}
+ protected String getModulePath(IModule[] module ) {
+ String modulePath = "";
+ for( int i = 0; i < module.length; i++ ) {
+ modulePath += module[i].getName() + Path.SEPARATOR;
+ }
+ modulePath = modulePath.substring(0, modulePath.length()-1);
+ return modulePath;
+ }
+
public IStatus publishModule(int kind, int deltaKind,
int modulePublishState, IModule[] module, IProgressMonitor monitor)
throws CoreException {
+ String modulePath = getModulePath(module);
+
IStatus status = null;
boolean deleted = false;
for( int i = 0; i < module.length; i++ ) {
@@ -96,11 +107,11 @@
status = unpublish(server, module, monitor);
} else if (kind == IServer.PUBLISH_FULL || kind == IServer.PUBLISH_CLEAN) {
if( deleted )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "The module cannot be published because it cannot be located"));
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "The module cannot be published because it cannot be located. (" + modulePath + ")"));
status = fullPublish(module, module[module.length-1], monitor);
} else if (kind == IServer.PUBLISH_INCREMENTAL || kind == IServer.PUBLISH_AUTO) {
if( deleted )
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "The module cannot be published because it cannot be located"));
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "The module cannot be published because it cannot be located. (" + modulePath + ")"));
status = incrementalPublish(module, module[module.length-1], monitor);
}
return status;
@@ -157,7 +168,7 @@
boolean error = localSafeDelete(getDeployPath(module), eventRoot);
if( error ) {
publishState = IServer.PUBLISH_STATE_FULL;
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Unable to delete module from server.", new Exception("Some files were not removed from the server")));
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Unable to delete module from server. (" + getModulePath(module) + ")", new Exception("Some files were not removed from the server")));
}
return null;
}
17 years, 2 months
JBoss Tools SVN: r4351 - branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-10-18 14:55:36 -0400 (Thu, 18 Oct 2007)
New Revision: 4351
Modified:
branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/.project
Log:
Project was renamed according to plugin id.
Modified: branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/.project
===================================================================
--- branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/.project 2007-10-18 18:48:07 UTC (rev 4350)
+++ branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/.project 2007-10-18 18:55:36 UTC (rev 4351)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.jboss.tools.vpe.test.richfaces</name>
+ <name>org.jboss.tools.jsf.vpe.richfaces.test</name>
<comment></comment>
<projects>
</projects>
17 years, 2 months
JBoss Tools SVN: r4350 - in branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-10-18 14:48:07 -0400 (Thu, 18 Oct 2007)
New Revision: 4350
Added:
branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/
branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/
branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/
branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/
Removed:
branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/vpe/
Modified:
branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF
branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/Activator.java
branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/ImportRichFacesComponents.java
branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTest.java
branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java
Log:
PluginId and packages were renamed according to place of tests
Modified: branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF 2007-10-18 18:33:32 UTC (rev 4349)
+++ branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/META-INF/MANIFEST.MF 2007-10-18 18:48:07 UTC (rev 4350)
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Richfaces Plug-in
-Bundle-SymbolicName: org.jboss.tools.vpe.test.richfaces
+Bundle-SymbolicName: org.jboss.tools.jsf.vpe.richfaces.test
Bundle-Version: 1.0.0
-Bundle-Activator: org.jboss.tools.vpe.test.richfaces.Activator
+Bundle-Activator: org.jboss.tools.jsf.vpe.richfaces.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.jboss.tools.vpe,
Copied: branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test (from rev 4349, branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/vpe/test/richfaces)
Modified: branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/Activator.java
===================================================================
--- branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/vpe/test/richfaces/Activator.java 2007-10-18 18:33:32 UTC (rev 4349)
+++ branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/Activator.java 2007-10-18 18:48:07 UTC (rev 4350)
@@ -8,7 +8,7 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.vpe.test.richfaces;
+package org.jboss.tools.jsf.vpe.richfaces.test;
import java.net.URL;
@@ -24,7 +24,7 @@
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.vpe.test.richfaces";
+ public static final String PLUGIN_ID = "org.jboss.tools.jsf.vpe.richfaces.test";
// The shared instance
private static Activator plugin;
Modified: branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/ImportRichFacesComponents.java
===================================================================
--- branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/vpe/test/richfaces/ImportRichFacesComponents.java 2007-10-18 18:33:32 UTC (rev 4349)
+++ branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/ImportRichFacesComponents.java 2007-10-18 18:48:07 UTC (rev 4350)
@@ -8,7 +8,7 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.vpe.test.richfaces;
+package org.jboss.tools.jsf.vpe.richfaces.test;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
Modified: branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTest.java
===================================================================
--- branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/vpe/test/richfaces/RichFacesAllTest.java 2007-10-18 18:33:32 UTC (rev 4349)
+++ branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTest.java 2007-10-18 18:48:07 UTC (rev 4350)
@@ -8,7 +8,7 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.vpe.test.richfaces;
+package org.jboss.tools.jsf.vpe.richfaces.test;
import junit.framework.Test;
import junit.framework.TestSuite;
Modified: branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java
===================================================================
--- branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/vpe/test/richfaces/RichFacesComponentTest.java 2007-10-18 18:33:32 UTC (rev 4349)
+++ branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2007-10-18 18:48:07 UTC (rev 4350)
@@ -8,7 +8,7 @@
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.vpe.test.richfaces;
+package org.jboss.tools.jsf.vpe.richfaces.test;
import java.util.Collection;
17 years, 2 months
JBoss Tools SVN: r4349 - in branches/jbosstools_xulrunner: vpe/tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-10-18 14:33:32 -0400 (Thu, 18 Oct 2007)
New Revision: 4349
Added:
branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/
Removed:
branches/jbosstools_xulrunner/vpe/tests/org.jboss.tools.vpe.test.richfaces/
Log:
Move richfaces' tests into the right place
Copied: branches/jbosstools_xulrunner/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test (from rev 4348, branches/jbosstools_xulrunner/vpe/tests/org.jboss.tools.vpe.test.richfaces)
17 years, 2 months
JBoss Tools SVN: r4348 - in trunk: vpe/tests and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-10-18 14:27:14 -0400 (Thu, 18 Oct 2007)
New Revision: 4348
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/
Removed:
trunk/vpe/tests/org.jboss.tools.vpe.test.richfaces/
Log:
Move richfaces' tests into the right place
Copied: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test (from rev 4347, trunk/vpe/tests/org.jboss.tools.vpe.test.richfaces)
17 years, 2 months
JBoss Tools SVN: r4347 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2007-10-18 14:16:39 -0400 (Thu, 18 Oct 2007)
New Revision: 4347
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1097
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-10-18 16:10:54 UTC (rev 4346)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-10-18 18:16:39 UTC (rev 4347)
@@ -120,6 +120,7 @@
import org.jboss.tools.vpe.editor.template.VpeTemplateListener;
import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
import org.jboss.tools.vpe.editor.toolbar.format.FormatControllerManager;
+import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.editor.util.TextUtil;
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.jboss.tools.vpe.editor.util.VpeDndUtil;
@@ -744,8 +745,17 @@
System.out.println("<<< mouseDown targetNode: " + visualNode.getNodeName() + " (" + visualNode + ") selectedElement: " + (visualDragElement != null ? visualDragElement.getNodeName() + " (" + visualDragElement + ")" : null)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
}
mouseDownSelectionFlag = false;
+
if (visualDragElement != null) {
- selectionBuilder.setVisualElementSelection(visualDragElement);
+
+ //we shouldn't change selection when we click on <input type="text" /> element,
+ //because if we change after resizing the input element lost selection
+ if(HTML.TAG_INPUT.equalsIgnoreCase(visualDragElement.getNodeName())&&
+ !HTML.ATTR_TEXT.equalsIgnoreCase(visualDragElement.getAttribute(HTML.ATTR_TYPE))
+ &&visualDragElement.getAttribute(HTML.ATTR_TYPE)!=null) {
+
+ selectionBuilder.setVisualElementSelection(visualDragElement);
+ }
mouseDownSelectionFlag = true;
} else {
selectionBuilder.setCaretAtMouse(mouseEvent);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2007-10-18 16:10:54 UTC (rev 4346)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2007-10-18 18:16:39 UTC (rev 4347)
@@ -51,4 +51,6 @@
public static final String ATTR_ID = "ID";
+ public static final String ATTR_TYPE ="TYPE";
+ public static final String ATTR_TEXT ="TEXT";
}
\ No newline at end of file
17 years, 2 months