JBoss Tools SVN: r18413 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2009-11-05 07:50:16 -0500 (Thu, 05 Nov 2009)
New Revision: 18413
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5142 fixed
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-11-05 02:27:35 UTC (rev 18412)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-11-05 12:50:16 UTC (rev 18413)
@@ -1156,6 +1156,9 @@
if (controller != null
&& !controller.isVisualEditorVisible()) {
controller.setVisualEditorVisible(true);
+ if (controller.getSelectionManager()!=null) {
+ controller.getSelectionManager().refreshVisualSelection();
+ }
if (!controller.isSynced()) {
controller.visualRefresh();
}
14 years, 6 months
JBoss Tools SVN: r18412 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-11-04 21:27:35 -0500 (Wed, 04 Nov 2009)
New Revision: 18412
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
Log:
JBIDE-5121 - finally just hacked and cleaved it
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java 2009-11-05 01:03:49 UTC (rev 18411)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java 2009-11-05 02:27:35 UTC (rev 18412)
@@ -10,9 +10,12 @@
******************************************************************************/
package org.jboss.ide.eclipse.archives.webtools.modules;
+import java.io.File;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -31,15 +34,13 @@
import org.eclipse.wst.server.core.model.ModuleDelegate;
import org.eclipse.wst.server.core.model.ModuleFactoryDelegate;
import org.eclipse.wst.server.core.util.ModuleFile;
+import org.eclipse.wst.server.core.util.ModuleFolder;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNodeVisitor;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension.FileWrapper;
import org.jboss.ide.eclipse.archives.core.util.ModelUtil;
-import org.jboss.ide.eclipse.archives.core.util.PathUtils;
-import org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin;
/**
*
@@ -172,212 +173,118 @@
return moduleContributor.getModuleDelegate(module);
}
- public static interface IExtendedModuleResource extends IModuleResource {
- public IPath getSourcePath();
- public IArchiveNode getNode();
- // deep destination is the full path this resource represents, even if it's inside a jar
- public IPath getDeepDestination();
- // the concrete file this resource is part of... so the top most zipped jar or, if all is exploded, the file itself
- public IPath getConcreteDestFile();
- }
-
public static class DelegateInitVisitor implements IArchiveNodeVisitor {
private IArchive pack;
- private HashMap<IArchiveNode, ArchiveContainerResource> members; // node -> imoduleresource
+ private HashMap<IArchiveNode, IModuleResource> members; // node -> imoduleresource
private HashMap<IPath, IArchiveNode> pathToNode; // path -> node
public DelegateInitVisitor(IArchive pack) {
this.pack = pack;
reset();
}
public void reset() {
- members = new HashMap<IArchiveNode, ArchiveContainerResource>();
+ members = new HashMap<IArchiveNode, IModuleResource>();
pathToNode = new HashMap<IPath, IArchiveNode>();
}
- public boolean visit(IArchiveNode node) {
- int type = node.getNodeType();
- // not sure why this is giving wrong values but it seems to go deep into IArchive code
- IPath rootRelative = node.getRootArchiveRelativePath().removeFirstSegments(1);
- if( type == IArchiveNode.TYPE_ARCHIVE && ((IArchive)node).isTopLevel()) {
- members.put(node, new ArchiveContainerResource(((IArchive)node).getName(), node, rootRelative));
- pathToNode.put(rootRelative, node);
- } else if( type == IArchiveNode.TYPE_ARCHIVE || type == IArchiveNode.TYPE_ARCHIVE_FOLDER) {
- String name = type == IArchiveNode.TYPE_ARCHIVE ? ((IArchive)node).getName() : ((IArchiveFolder)node).getName();
- // if we're any other archive or a folder, create us and add to parent
- IArchiveNode parent = node.getParent();
- ArchiveContainerResource parentAsResource = members.get(parent);
- members.put(node, new ArchiveContainerResource(name, node, rootRelative));
- pathToNode.put(rootRelative, node);
- parentAsResource.addChild(members.get(node));
- } else if( type == IArchiveNode.TYPE_ARCHIVE_FILESET ) {
- ArchiveContainerResource parentAsResource = members.get(node.getParent());
- parentAsResource.addFilesetAsChild((IArchiveFileSet)node);
- }
-
- return true;
- }
-
- public IModuleResource getRootResource() {
- return members.get(pack);
- }
-
- public IModuleResource getResourceForNode(IArchiveNode node) {
- return members.get(node);
- }
- }
-
- public static class ArchiveContainerResource implements IModuleFolder, IExtendedModuleResource {
-
- protected IPath moduleRelativePath;
- protected IPath fsRelative;
- protected IArchiveNode node;
- protected String name;
- private HashMap<IPath, IModuleResource> members;
-
- // represents source folder on disk. only used if node is fileset
-// private IPath folderGlobalPath = null;
- public ArchiveContainerResource(String name,IArchiveNode node,IPath moduleRelativePath ) {
- this.name = name;
- this.node = node;
- this.moduleRelativePath = moduleRelativePath;
- members = new HashMap<IPath, IModuleResource>();
- if( node.getNodeType() == IArchiveNode.TYPE_ARCHIVE_FILESET ) {
- fsRelative = moduleRelativePath.removeFirstSegments(node.getParent().getRootArchiveRelativePath().removeFirstSegments(1).segmentCount());
- }
- }
-
- public int hashCode() {
- return name.hashCode() * 37 + moduleRelativePath.hashCode();
- }
-
- public boolean equals(Object other) {
- if (other instanceof IModuleFolder) {
- IModuleFolder resource = (IModuleFolder) other;
- return resource.getModuleRelativePath().equals(getModuleRelativePath());
- }
+
+ protected boolean addZippedPackage(IArchiveNode node) {
+ IPath pathWithName = node.getRootArchiveRelativePath().removeFirstSegments(1);
+ IPath path = pathWithName;
+ if( path.segmentCount() > 0 )
+ path = path.removeLastSegments(1);
+ File root = ModelUtil.getBaseDestinationFile(node).toFile();
+ IModuleFile mf = new ModuleFile(root, root.getName(), path);
+ members.put(node, mf);
+ pathToNode.put(pathWithName, node);
+ if( node.getRootArchive() != node )
+ ((PackagesModuleFolder)members.get(node.getParent())).addChild(mf);
return false;
}
-
- public void addChild(IModuleResource resource) {
- members.put(resource.getModuleRelativePath(), resource);
+
+ protected boolean addFolder(IArchiveNode node) {
+ IPath pathWithName = node.getRootArchiveRelativePath().removeFirstSegments(1);
+ IPath path = pathWithName;
+ if( path.segmentCount() > 0 )
+ path = path.removeLastSegments(1);
+ File root = ModelUtil.getBaseDestinationFile(node).toFile();
+ PackagesModuleFolder mf = new PackagesModuleFolder(root, root.getName(), path);
+ members.put(node, mf);
+ pathToNode.put(pathWithName, node);
+ if( node.getRootArchive() != node )
+ ((PackagesModuleFolder)members.get(node.getParent())).addChild(mf);
+ return true;
}
-
- public void removeChild(IPath moduleRelativePath) {
- members.remove(moduleRelativePath);
- }
- public IModuleResource getChild(IPath path) {
- return members.get(path);
- }
-
- public void addFilesetAsChild(IArchiveFileSet fs) {
+
+ public boolean addFilesetAsChild(IArchiveFileSet fs) {
FileWrapper[] files = fs.findMatchingPaths(); // file-system based source paths
if( files != null ) {
for( int i = 0; i < files.length; i++ ) {
addFilesetPathAsChild(fs, files[i]);
}
}
+ return true;
}
public void addFilesetPathAsChild(IArchiveFileSet fs, FileWrapper file) {
IPath fsRelative = new Path(file.getFilesetRelative());
- ArchiveContainerResource parent = find(fs, fsRelative.removeLastSegments(1), true);
- ExtendedModuleFile emf = new ExtendedModuleFile(file, fs);
- parent.addChild(emf);
+ IPath path = fs.getRootArchiveRelativePath().removeFirstSegments(1).append(fsRelative);
+ PackagesModuleFolder parent = find(fs, fsRelative.removeLastSegments(1), true);
+ IModuleFile mf = new ModuleFile(file, file.getName(), path.removeLastSegments(1));
+ parent.addChild(mf);
}
- protected ArchiveContainerResource find(IArchiveFileSet fs, IPath fsRelative, boolean create) {
- ArchiveContainerResource resource = this;
- ArchiveContainerResource tmpResource;
+ protected PackagesModuleFolder find(IArchiveFileSet fs, IPath fsRelative, boolean create) {
+ PackagesModuleFolder folder = (PackagesModuleFolder)members.get(fs.getParent());
+ IPath folderPathWithName = folder.getModuleRelativePath().append(folder.getName());
+
+ PackagesModuleFolder tmpFolder;
IPath tmpPath = fs.getRootArchiveRelativePath().removeFirstSegments(1);
int count = fsRelative.segmentCount();
for( int i = 0; i < count; i++ ) {
tmpPath = tmpPath.append(fsRelative.segment(i));
- tmpResource = (ArchiveContainerResource)resource.getChild(tmpPath);
- if( tmpResource == null ) {
+ tmpFolder = (PackagesModuleFolder)folder.getChild(fsRelative.segment(i));
+ if( tmpFolder == null ) {
if( !create )
return null;
- tmpResource = new ArchiveContainerResource(tmpPath.lastSegment(), fs, tmpPath);
- resource.addChild(tmpResource);
+ tmpFolder = new PackagesModuleFolder(null, tmpPath.lastSegment(), tmpPath.removeLastSegments(1));
+ folder.addChild(tmpFolder);
}
- resource = tmpResource;
+ folder = tmpFolder;
}
- return resource;
+ return folder;
}
-
- public IModuleResource[] members() {
- Collection<IModuleResource> c = members.values();
- return c.toArray(new IModuleResource[c.size()]);
+
+ public boolean visit(IArchiveNode node) {
+ try {
+ if( node == pack ) // we're at the root
+ if( !pack.isExploded())
+ return addZippedPackage(pack);
+
+ int type = node.getNodeType();
+ if( type == IArchiveNode.TYPE_ARCHIVE && !((IArchive)node).isExploded())
+ return addZippedPackage(node);
+
+ if( type == IArchiveNode.TYPE_ARCHIVE || type == IArchiveNode.TYPE_ARCHIVE_FOLDER)
+ return addFolder(node);
+
+ if( type == IArchiveNode.TYPE_ARCHIVE_FILESET )
+ return addFilesetAsChild((IArchiveFileSet)node);
+ } catch( Exception e) {
+ e.printStackTrace();
+ }
+ return true;
}
- public IPath getModuleRelativePath() {
- return moduleRelativePath;
+ public IModuleResource getRootResource() {
+ return members.get(pack);
}
- public String getName() {
- return name;
+ public IModuleResource getResourceForNode(IArchiveNode node) {
+ return members.get(node);
}
-
- public Object getAdapter(Class adapter) {
- return null;
- }
-
- public IPath getDeepDestination() {
- IPath tmp = node.getNodeType() == IArchiveNode.TYPE_ARCHIVE_FILESET
- ? moduleRelativePath : node.getRootArchiveRelativePath();
- return PathUtils.getGlobalLocation(node.getRootArchive()).append(tmp);
- }
-
- public IPath getConcreteDestFile() {
- if( node.getNodeType() == IArchiveNode.TYPE_ARCHIVE_FILESET )
- return ModelUtil.getBaseDestinationFile((IArchiveFileSet)node,fsRelative);
- else
- return ModelUtil.getBaseDestinationFile((IArchiveFileSet)node);
- }
- public IArchiveNode getNode() {
- return node;
- }
-
- public IPath getSourcePath() {
- return null;
- }
-
}
- public static class ExtendedModuleFile extends ModuleFile implements IExtendedModuleResource {
- private FileWrapper wrapper;
- private IArchiveFileSet node;
- public ExtendedModuleFile(FileWrapper wrapper, IArchiveFileSet fs) {
- super(wrapper.getOutputName(), wrapper.getRootArchiveRelative(), wrapper.lastModified());
- this.node = fs;
- this.wrapper = wrapper;
- }
- public int hashCode() {
- return getName().hashCode() * 37 + getPath().hashCode();
- }
- public IPath getPath() { return new Path(wrapper.getAbsolutePath()); }
- public IArchiveNode getNode() { return node; }
- public IPath getDeepDestination() {
- return PathUtils.getGlobalLocation(node.getRootArchive()).append(wrapper.getRootArchiveRelative());
- }
- public IPath getSourcePath() {
- return new Path(this.wrapper.getAbsolutePath());
- }
-
- public IPath getConcreteDestFile() {
- return ModelUtil.getBaseDestinationFile(node, new Path(this.wrapper.getFilesetRelative()));
- }
-
- public boolean equals(Object other) {
- if (other instanceof IModuleFile) {
- IModuleFile resource = (IModuleFile) other;
- return resource.getModuleRelativePath().equals(getModuleRelativePath());
- }
- return false;
- }
-
- }
-
public static class PackagedModuleDelegate extends ModuleDelegate {
private IArchive pack;
private IModuleResource rootResource;
@@ -402,6 +309,8 @@
public IModuleResource[] members() throws CoreException {
init();
+ if( !pack.isExploded() )
+ return new IModuleResource[] { rootResource };
return ((IModuleFolder)rootResource).members();
}
@@ -409,5 +318,31 @@
return Status.OK_STATUS;
}
}
-
+
+ public static class PackagesModuleFolder extends ModuleFolder {
+ private File file;
+ private HashMap<String, IModuleResource> children = new HashMap<String, IModuleResource>();
+ public PackagesModuleFolder(File f, String name, IPath path) {
+ super(null, name, path);
+ this.file = f;
+ }
+ public Object getAdapter(Class cl) {
+ if( File.class.equals(cl))
+ return file;
+ return null;
+ }
+
+ public void addChild(IModuleResource resource) {
+ children.put(resource.getName(), resource);
+ Collection<IModuleResource> l = children.values();
+ setMembers((IModuleResource[]) l.toArray(new IModuleResource[l.size()]));
+ }
+
+ public PackagesModuleFolder getChild(String name) {
+ Object o = children.get(name);
+ if( o != null && o instanceof PackagesModuleFolder)
+ return (PackagesModuleFolder)o;
+ return null;
+ }
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-11-05 01:03:49 UTC (rev 18411)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-11-05 02:27:35 UTC (rev 18412)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.ide.eclipse.archives.webtools.modules;
+import java.io.File;
import java.util.ArrayList;
import org.eclipse.core.runtime.CoreException;
@@ -22,16 +23,12 @@
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.model.IModuleFile;
-import org.eclipse.wst.server.core.model.IModuleFolder;
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.util.PathUtils;
import org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin;
import org.jboss.ide.eclipse.archives.webtools.Messages;
-import org.jboss.ide.eclipse.archives.webtools.modules.PackageModuleFactory.ExtendedModuleFile;
-import org.jboss.ide.eclipse.archives.webtools.modules.PackageModuleFactory.IExtendedModuleResource;
import org.jboss.ide.eclipse.archives.webtools.modules.PackageModuleFactory.PackagedModuleDelegate;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
@@ -131,11 +128,13 @@
return;
}
- if( incremental ) {
- publishFromDelta(module, destPathRoot, sourcePath.removeLastSegments(1), delta);
- } else {
+ if( !incremental || !pack.isExploded() ) { // full publish, or zipped
// full publish, copy whole folder or file
FileUtil.fileSafeCopy(sourcePath.toFile(), destPathRoot.toFile(), listener);
+ } else if( destPathRoot.toFile().exists() && destPathRoot.toFile().isFile()) {
+ FileUtil.fileSafeCopy(sourcePath.toFile(), destPathRoot.toFile(), listener);
+ } else {
+ publishFromDelta(module, destPathRoot, sourcePath.removeLastSegments(1), delta);
}
}
@@ -149,63 +148,22 @@
protected void publishFromDeltaHandle(IModuleResourceDelta delta, IPath destRoot,
IPath sourcePrefix, ArrayList<IPath> changedFiles) {
- switch( delta.getKind()) {
- case IModuleResourceDelta.REMOVED:
- // removed might not be IExtendedModuleResource
- IModuleResource imr = delta.getModuleResource();
- if( imr instanceof IExtendedModuleResource) {
- IExtendedModuleResource emr = ((IExtendedModuleResource)imr);
- IPath concrete = emr.getConcreteDestFile();
- if( !changedFiles.contains(concrete)) {
- IPath destPath = destRoot.append(concrete.removeFirstSegments(sourcePrefix.segmentCount()));
-
- // file hasnt been updated yet.
- // But we don't know whether to delete or copy this file.
- // depends where it is in the tree and what's exploded.
- changedFiles.add(concrete);
- IPath concreteRelative = concrete.removeFirstSegments(sourcePrefix.segmentCount()).setDevice(null);
- IPath emrModRelative = emr.getModuleRelativePath();
- boolean delete = concreteRelative.equals(emrModRelative);
-
- if( delete ) {
- FileUtil.safeDelete(destPath.toFile(), listener);
- } else {
- // copy
- FileUtil.fileSafeCopy(concrete.toFile(), destPath.toFile(), listener);
- }
- }
+ IModuleResource imr = delta.getModuleResource();
+ File f = (File)imr.getAdapter(File.class);
+ if( f != null ) {
+ IPath destPath = destRoot.append(imr.getModuleRelativePath()).append(imr.getName());
+ switch( delta.getKind()) {
+ case IModuleResourceDelta.REMOVED:
+ FileUtil.safeDelete(destPath.toFile(), listener);
return;
- } else {
- // TODO
+ case IModuleResourceDelta.ADDED:
+ FileUtil.fileSafeCopy(f, destPath.toFile(), listener);
return;
+ case IModuleResourceDelta.CHANGED:
+ FileUtil.fileSafeCopy(f, destPath.toFile(), listener);
+ break;
}
- case IModuleResourceDelta.ADDED:
- imr = delta.getModuleResource();
- if( imr instanceof IExtendedModuleResource) {
- IPath concrete = ((IExtendedModuleResource)imr).getConcreteDestFile();
- if( !changedFiles.contains(concrete)) {
- changedFiles.add(concrete);
- IPath destPath = destRoot.append(concrete.removeFirstSegments(sourcePrefix.segmentCount()));
- FileUtil.fileSafeCopy(concrete.toFile(), destPath.toFile(), listener);
- }
- return;
- } else {
- // TODO
- return;
- }
- case IModuleResourceDelta.CHANGED:
- imr = delta.getModuleResource();
- if( imr instanceof ExtendedModuleFile ) {
- IPath concrete = ((ExtendedModuleFile)imr).getConcreteDestFile();
- if( !changedFiles.contains(concrete)) {
- IPath destPath = destRoot.append(concrete.removeFirstSegments(sourcePrefix.segmentCount()+1));
- FileUtil.fileSafeCopy(concrete.toFile(), destPath.toFile(), listener);
- changedFiles.add(concrete);
- }
- }
- break;
}
-
IModuleResourceDelta[] children = delta.getAffectedChildren();
if( children != null ) {
for( int i = 0; i < children.length; i++ ) {
14 years, 6 months
JBoss Tools SVN: r18411 - in trunk/jmx: features/org.jboss.tools.jmx.feature/sourceTemplatePlugin and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2009-11-04 20:03:49 -0500 (Wed, 04 Nov 2009)
New Revision: 18411
Added:
trunk/jmx/plugins/org.jboss.tools.jmx.core/about.properties
Modified:
trunk/jmx/features/org.jboss.tools.jmx.feature/sourceTemplateFeature/build.properties
trunk/jmx/features/org.jboss.tools.jmx.feature/sourceTemplatePlugin/about.properties
trunk/jmx/features/org.jboss.tools.jmx.tests.feature/sourceTemplatePlugin/about.properties
trunk/jmx/plugins/org.jboss.tools.jmx.ui/about.properties
trunk/jmx/plugins/org.jboss.tools.jmx.ui/about_ja.properties
trunk/jmx/tests/org.jboss.tools.jmx.ui.test.interactive/plugin.properties
trunk/jmx/tests/org.jboss.tools.jmx.ui.test/plugin.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5116 fix copyrights to state JBoss by Red Hat but ref Jeff Mesnil explicitly. *.java untouched, just plugin/feature metadata files.
Modified: trunk/jmx/features/org.jboss.tools.jmx.feature/sourceTemplateFeature/build.properties
===================================================================
--- trunk/jmx/features/org.jboss.tools.jmx.feature/sourceTemplateFeature/build.properties 2009-11-04 23:04:34 UTC (rev 18410)
+++ trunk/jmx/features/org.jboss.tools.jmx.feature/sourceTemplateFeature/build.properties 2009-11-05 01:03:49 UTC (rev 18411)
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2009 Red Hat and others.
+# Copyright (c) 2009 JBoss by Red Hat, and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
Modified: trunk/jmx/features/org.jboss.tools.jmx.feature/sourceTemplatePlugin/about.properties
===================================================================
--- trunk/jmx/features/org.jboss.tools.jmx.feature/sourceTemplatePlugin/about.properties 2009-11-04 23:04:34 UTC (rev 18410)
+++ trunk/jmx/features/org.jboss.tools.jmx.feature/sourceTemplatePlugin/about.properties 2009-11-05 01:03:49 UTC (rev 18411)
@@ -3,5 +3,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Red Hat contributors and others, 2009. All rights reserved.\n\
+(c) Copyright 2009 JBoss by Red Hat, and others. Initial contribution by Jeff Mesnil, http://jmesnil.net. All rights reserved.\n\
Visit http://www.jboss.org/tools
Modified: trunk/jmx/features/org.jboss.tools.jmx.tests.feature/sourceTemplatePlugin/about.properties
===================================================================
--- trunk/jmx/features/org.jboss.tools.jmx.tests.feature/sourceTemplatePlugin/about.properties 2009-11-04 23:04:34 UTC (rev 18410)
+++ trunk/jmx/features/org.jboss.tools.jmx.tests.feature/sourceTemplatePlugin/about.properties 2009-11-05 01:03:49 UTC (rev 18411)
@@ -3,5 +3,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Red Hat contributors and others, 2009. All rights reserved.\n\
+(c) Copyright 2009 JBoss by Red Hat, and others. Initial contribution by Jeff Mesnil, http://jmesnil.net All rights reserved.\n\
Visit http://www.jboss.org/tools
Added: trunk/jmx/plugins/org.jboss.tools.jmx.core/about.properties
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/about.properties (rev 0)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/about.properties 2009-11-05 01:03:49 UTC (rev 18411)
@@ -0,0 +1,6 @@
+blurb=JMX Resources Bundle\n\
+\n\
+Version: {featureVersion}\n\
+\n\
+Copyright (c) 2006-2009 JBoss by Redhat, and others. Initial contribution by Jeff Mesnil, http://jmesnil.net
+
Property changes on: trunk/jmx/plugins/org.jboss.tools.jmx.core/about.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/about.properties
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/about.properties 2009-11-04 23:04:34 UTC (rev 18410)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/about.properties 2009-11-05 01:03:49 UTC (rev 18411)
@@ -2,5 +2,5 @@
\n\
Version: {featureVersion}\n\
\n\
-Copyright (c) 2006 Jeff Mesnil, http://jmesnil.net
+Copyright (c) 2006-2009 JBoss by Redhat, and others. Initial contribution by Jeff Mesnil, http://jmesnil.net
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/about_ja.properties
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/about_ja.properties 2009-11-04 23:04:34 UTC (rev 18410)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/about_ja.properties 2009-11-05 01:03:49 UTC (rev 18411)
@@ -1 +1 @@
-blurb=JMX \u30B3\u30F3\u30BD\u30FC\u30EB\n\nVersion\: {featureVersion}\n\nCopyright (c) 2006 Jeff Mesnil, http\://jmesnil.net
+blurb=JMX \u30B3\u30F3\u30BD\u30FC\u30EB\n\nVersion\: {featureVersion}\n\nCopyright (c) 2006-2009 JBoss by Redhat, and others. Initial contribution by Jeff Mesnil, http://jmesnil.net
Modified: trunk/jmx/tests/org.jboss.tools.jmx.ui.test/plugin.properties
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.ui.test/plugin.properties 2009-11-04 23:04:34 UTC (rev 18410)
+++ trunk/jmx/tests/org.jboss.tools.jmx.ui.test/plugin.properties 2009-11-05 01:03:49 UTC (rev 18411)
@@ -1,3 +1,3 @@
#Properties file for org.jboss.tools.jmx.ui.test
-Bundle-Vendor.f0 = Jeff Mesnil
+Bundle-Vendor.f0 = JBoss by Redhat
Bundle-Name.f0 = JMX UI Test Fragment
\ No newline at end of file
Modified: trunk/jmx/tests/org.jboss.tools.jmx.ui.test.interactive/plugin.properties
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.ui.test.interactive/plugin.properties 2009-11-04 23:04:34 UTC (rev 18410)
+++ trunk/jmx/tests/org.jboss.tools.jmx.ui.test.interactive/plugin.properties 2009-11-05 01:03:49 UTC (rev 18411)
@@ -1,3 +1,3 @@
#Properties file for org.jboss.tools.jmx.ui.test.interactive
-Bundle-Vendor.0 = Jeff Mesnil
+Bundle-Vendor.0 = JBoss by Redhat
Bundle-Name.0 = JMX UI Interactive Tests Bundle
\ No newline at end of file
14 years, 6 months
JBoss Tools SVN: r18410 - 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: 2009-11-04 18:04:34 -0500 (Wed, 04 Nov 2009)
New Revision: 18410
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
Log:
JBIDE-5121
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2009-11-04 23:04:04 UTC (rev 18409)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2009-11-04 23:04:34 UTC (rev 18410)
@@ -159,6 +159,9 @@
suffix = IJBossServerConstants.EXT_RAR;
else if( IJBossServerConstants.FACET_ESB.equals(type))
suffix = IJBossServerConstants.EXT_ESB;
+ else if( "jboss.package".equals(type)) //$NON-NLS-1$
+ // no suffix required, name already has it
+ suffix = ""; //$NON-NLS-1$
else
suffix = IJBossServerConstants.EXT_JAR;
return suffix;
14 years, 6 months
JBoss Tools SVN: r18409 - in trunk/as: tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-11-04 18:04:04 -0500 (Wed, 04 Nov 2009)
New Revision: 18409
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java
Log:
JBIDE-5121
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java 2009-11-04 17:58:59 UTC (rev 18408)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java 2009-11-04 23:04:04 UTC (rev 18409)
@@ -196,18 +196,18 @@
}
public boolean visit(IArchiveNode node) {
int type = node.getNodeType();
+ // not sure why this is giving wrong values but it seems to go deep into IArchive code
+ IPath rootRelative = node.getRootArchiveRelativePath().removeFirstSegments(1);
if( type == IArchiveNode.TYPE_ARCHIVE && ((IArchive)node).isTopLevel()) {
- IPath rel = ((IArchive)node).getRootArchiveRelativePath();
- members.put(node, new ArchiveContainerResource(((IArchive)node).getName(), node, rel));
- pathToNode.put(rel, node);
+ members.put(node, new ArchiveContainerResource(((IArchive)node).getName(), node, rootRelative));
+ pathToNode.put(rootRelative, node);
} else if( type == IArchiveNode.TYPE_ARCHIVE || type == IArchiveNode.TYPE_ARCHIVE_FOLDER) {
String name = type == IArchiveNode.TYPE_ARCHIVE ? ((IArchive)node).getName() : ((IArchiveFolder)node).getName();
// if we're any other archive or a folder, create us and add to parent
IArchiveNode parent = node.getParent();
ArchiveContainerResource parentAsResource = members.get(parent);
- IPath rel = node.getRootArchiveRelativePath();
- members.put(node, new ArchiveContainerResource(name, node, rel));
- pathToNode.put(rel, node);
+ members.put(node, new ArchiveContainerResource(name, node, rootRelative));
+ pathToNode.put(rootRelative, node);
parentAsResource.addChild(members.get(node));
} else if( type == IArchiveNode.TYPE_ARCHIVE_FILESET ) {
ArchiveContainerResource parentAsResource = members.get(node.getParent());
@@ -242,7 +242,7 @@
this.moduleRelativePath = moduleRelativePath;
members = new HashMap<IPath, IModuleResource>();
if( node.getNodeType() == IArchiveNode.TYPE_ARCHIVE_FILESET ) {
- fsRelative = moduleRelativePath.removeFirstSegments(node.getParent().getRootArchiveRelativePath().segmentCount());
+ fsRelative = moduleRelativePath.removeFirstSegments(node.getParent().getRootArchiveRelativePath().removeFirstSegments(1).segmentCount());
}
}
@@ -288,7 +288,7 @@
protected ArchiveContainerResource find(IArchiveFileSet fs, IPath fsRelative, boolean create) {
ArchiveContainerResource resource = this;
ArchiveContainerResource tmpResource;
- IPath tmpPath = fs.getRootArchiveRelativePath();
+ IPath tmpPath = fs.getRootArchiveRelativePath().removeFirstSegments(1);
int count = fsRelative.segmentCount();
for( int i = 0; i < count; i++ ) {
tmpPath = tmpPath.append(fsRelative.segment(i));
@@ -402,7 +402,7 @@
public IModuleResource[] members() throws CoreException {
init();
- return new IModuleResource[] { rootResource };
+ return ((IModuleFolder)rootResource).members();
}
public IStatus validate() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-11-04 17:58:59 UTC (rev 18408)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-11-04 23:04:04 UTC (rev 18409)
@@ -135,7 +135,7 @@
publishFromDelta(module, destPathRoot, sourcePath.removeLastSegments(1), delta);
} else {
// full publish, copy whole folder or file
- FileUtil.fileSafeCopy(sourcePath.toFile(), destPathRoot.append(sourcePath.lastSegment()).toFile(), listener);
+ FileUtil.fileSafeCopy(sourcePath.toFile(), destPathRoot.toFile(), listener);
}
}
@@ -198,9 +198,9 @@
if( imr instanceof ExtendedModuleFile ) {
IPath concrete = ((ExtendedModuleFile)imr).getConcreteDestFile();
if( !changedFiles.contains(concrete)) {
+ IPath destPath = destRoot.append(concrete.removeFirstSegments(sourcePrefix.segmentCount()+1));
+ FileUtil.fileSafeCopy(concrete.toFile(), destPath.toFile(), listener);
changedFiles.add(concrete);
- IPath destPath = destRoot.append(concrete.removeFirstSegments(sourcePrefix.segmentCount()));
- FileUtil.fileSafeCopy(concrete.toFile(), destPath.toFile(), listener);
}
}
break;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java 2009-11-04 17:58:59 UTC (rev 18408)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployTest.java 2009-11-04 23:04:04 UTC (rev 18409)
@@ -10,6 +10,7 @@
import java.util.HashSet;
import java.util.Set;
+import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import org.eclipse.core.resources.IFile;
@@ -40,8 +41,8 @@
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.ArchivesModel;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
+import org.jboss.ide.eclipse.archives.core.model.IArchiveModelRootNode;
import org.jboss.ide.eclipse.archives.core.model.IArchiveStandardFileSet;
-import org.jboss.ide.eclipse.archives.core.model.IArchiveModelRootNode;
import org.jboss.ide.eclipse.archives.ui.actions.BuildAction;
import org.jboss.ide.eclipse.archives.webtools.modules.ArchivesModuleModelListener;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
@@ -90,7 +91,7 @@
try {
assertDeployContents(count);
assertTrue("Deployed File should not have changed", false);
- } catch( AssertionError ae) {}
+ } catch( AssertionFailedError ae) {}
// Builder is on, auto-deploy is on
@@ -115,15 +116,15 @@
try {
assertBinContents(count);
assertTrue("Bin File should not have changed", false);
- } catch( AssertionError ae ) {}
+ } catch( AssertionFailedError ae ) {}
try {
assertBuiltArchiveContents(count);
assertTrue("Built Archive File should not have changed", false);
- } catch( AssertionError ae ) {}
+ } catch( AssertionFailedError ae ) {}
try {
assertDeployContents(count);
assertTrue("Deployed File should not have changed", false);
- } catch( AssertionError ae ) {}
+ } catch( AssertionFailedError ae ) {}
// Builder is off, autodeploy is on, manually call build!
callBuild();
14 years, 6 months
JBoss Tools SVN: r18408 - in trunk/documentation/whatsnew: jst and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-11-04 12:58:59 -0500 (Wed, 04 Nov 2009)
New Revision: 18408
Modified:
trunk/documentation/whatsnew/index.html
trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html
trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M4.html
Log:
what's new updated
Modified: trunk/documentation/whatsnew/index.html
===================================================================
--- trunk/documentation/whatsnew/index.html 2009-11-04 16:53:15 UTC (rev 18407)
+++ trunk/documentation/whatsnew/index.html 2009-11-04 17:58:59 UTC (rev 18408)
@@ -26,8 +26,7 @@
<td valign="top" align="left">
<p align="right"><b>3.1.0.M4</b>
<td valign="top">
- <p><a href="core/core-news-3.1.0.M4.html">Core/General</a></p>
- <p><a href="jst/jst-news-3.1.0.M4.html">JST/JSF Tools</a></p>
+ <p><a href="jst/jst-news-3.1.0.M4.html">JST/JSF Tools</a></p>
<p><a href="as/as-news-3.1.0.M4.html">JBoss AS Tools</a></p>
<p><a href="hibernate/hibernate-news-3.3.0.M4.html">Hibernate Tools</a></p>
<p><a href="examples/examples-news-1.1.0.M4.html">Project Examples</a></p>
Modified: trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html 2009-11-04 16:53:15 UTC (rev 18407)
+++ trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html 2009-11-04 17:58:59 UTC (rev 18408)
@@ -11,7 +11,7 @@
<body>
<h1>JST/JSF 3.1.0.M4 What's New</h1>
-<p align="right"><a href="../core/core-news-3.1.0.M4.html"><
+<p align="right"><a href="../index.html"><
Main Index</a> <a href="../as/as-news-3.1.0.M4.html">Server Tools ></a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
Modified: trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M4.html 2009-11-04 16:53:15 UTC (rev 18407)
+++ trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M4.html 2009-11-04 17:58:59 UTC (rev 18408)
@@ -11,8 +11,7 @@
<body>
<h1>Smooks tools 1.1.0.M4 What's New</h1>
-<p align="right"><a href="../index.html">< Main Index</a> <a
- href="../core/core-news-3.1.0.M4.html">Core/General ></a></p>
+<p align="right"><a href="../index.html">< Main Index</a></p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
14 years, 6 months
JBoss Tools SVN: r18407 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-11-04 11:53:15 -0500 (Wed, 04 Nov 2009)
New Revision: 18407
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5140
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2009-11-04 14:42:41 UTC (rev 18406)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2009-11-04 16:53:15 UTC (rev 18407)
@@ -208,6 +208,9 @@
private boolean enabled = true;
private boolean shouldFileBeValidated(IFile file) {
+ if(!file.isAccessible()) {
+ return false;
+ }
IProject project = file.getProject();
if(currentProject==null || !project.equals(currentProject)) {
enabled = isEnabled(project);
14 years, 6 months
JBoss Tools SVN: r18406 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2009-11-04 09:42:41 -0500 (Wed, 04 Nov 2009)
New Revision: 18406
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3734Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidths.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsDifferent.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsEms.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsPixels.xhtml.xml
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/html.html.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4022, https://jira.jboss.org/jira/browse/JBIDE-1546
For win and linux we use IFlasher to draw selection rectangle. Scroll and paint events support was added for repainting. For Mac OS we add border 2px is style attribute of a component. JUnit tests were fixed.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3734Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3734Test.java 2009-11-04 12:16:48 UTC (rev 18405)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3734Test.java 2009-11-04 14:42:41 UTC (rev 18406)
@@ -48,7 +48,7 @@
nsIDOMElement body = vpeController.getVisualBuilder().getContentArea();
assertEquals("bold", body.getAttribute(HTML.ATTR_CLASS)); //$NON-NLS-1$
- assertEquals("border: 2px solid red; background-color: black;", body.getAttribute(HTML.ATTR_STYLE)); //$NON-NLS-1$
+ assertEquals("background-color: black;", body.getAttribute(HTML.ATTR_STYLE)); //$NON-NLS-1$
if(getException()!=null) {
throw getException();
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml.xml 2009-11-04 12:16:48 UTC (rev 18405)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageAllFacets.xhtml.xml 2009-11-04 14:42:41 UTC (rev 18406)
@@ -1,7 +1,7 @@
<tests>
<test id="id1">
- <DIV STYLE="border: 2px solid blue; background-color: white;" CLASS="rich-page someClass">
+ <DIV STYLE="background-color: white;" CLASS="rich-page someClass">
<DIV CLASS="rich-page-header">
<DIV CLASS="rich-page-header-content">
<SPAN STYLE="font-size: 2em;">
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml 2009-11-04 12:16:48 UTC (rev 18405)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithLayout.xhtml.xml 2009-11-04 14:42:41 UTC (rev 18406)
@@ -1,7 +1,7 @@
<tests>
<test id="id1">
- <DIV CLASS="rich-page styleClass" STYLE="border: 2px solid blue; width: 1000px; background-color: white;">
+ <DIV CLASS="rich-page styleClass" STYLE="width: 1000px; background-color: white;">
<DIV CLASS="rich-page-header headerClass">
<DIV CLASS="rich-page-header-content">
<SPAN STYLE="font-size: 2em;">
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml 2009-11-04 12:16:48 UTC (rev 18405)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithNestedLayouts.xhtml.xml 2009-11-04 14:42:41 UTC (rev 18406)
@@ -1,7 +1,7 @@
<tests>
<test id="id1">
- <DIV CLASS="rich-page someClass" STYLE="border: 2px solid blue; width: 800px; background-color: white;">
+ <DIV CLASS="rich-page someClass" STYLE="width: 800px; background-color: white;">
<DIV CLASS="rich-page-header">
<DIV CLASS="rich-page-header-content">
<SPAN STYLE="font-size: 2em;">
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidths.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidths.xhtml.xml 2009-11-04 12:16:48 UTC (rev 18405)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidths.xhtml.xml 2009-11-04 14:42:41 UTC (rev 18406)
@@ -1,7 +1,7 @@
<tests>
<test id="id1">
- <DIV CLASS="rich-page styleClass" STYLE="border: 2px solid blue; width: 1000px; background-color: white;">
+ <DIV CLASS="rich-page styleClass" STYLE="width: 1000px; background-color: white;">
<DIV CLASS="rich-page-header headerClass">
<DIV CLASS="rich-page-header-content">
<SPAN STYLE="font-size: 2em;">
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsDifferent.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsDifferent.xhtml.xml 2009-11-04 12:16:48 UTC (rev 18405)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsDifferent.xhtml.xml 2009-11-04 14:42:41 UTC (rev 18406)
@@ -1,7 +1,7 @@
<tests>
<test id="id1">
- <DIV CLASS="rich-page styleClass" STYLE="border: 2px solid blue; width: 1000px; background-color: white;">
+ <DIV CLASS="rich-page styleClass" STYLE="width: 1000px; background-color: white;">
<DIV CLASS="rich-page-header headerClass">
<DIV CLASS="rich-page-header-content">
<SPAN STYLE="font-size: 2em;">
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsEms.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsEms.xhtml.xml 2009-11-04 12:16:48 UTC (rev 18405)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsEms.xhtml.xml 2009-11-04 14:42:41 UTC (rev 18406)
@@ -1,7 +1,7 @@
<tests>
<test id="id1">
- <DIV CLASS="rich-page styleClass" STYLE="border: 2px solid blue; width: 1000px; background-color: white;">
+ <DIV CLASS="rich-page styleClass" STYLE="width: 1000px; background-color: white;">
<DIV CLASS="rich-page-header headerClass">
<DIV CLASS="rich-page-header-content">
<SPAN STYLE="font-size: 2em;">
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsPixels.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsPixels.xhtml.xml 2009-11-04 12:16:48 UTC (rev 18405)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/page/pageWithWidthsPixels.xhtml.xml 2009-11-04 14:42:41 UTC (rev 18406)
@@ -1,7 +1,7 @@
<tests>
<test id="id1">
- <DIV CLASS="rich-page styleClass" STYLE="border: 2px solid blue; width: 1000px; background-color: white;">
+ <DIV CLASS="rich-page styleClass" STYLE="width: 1000px; background-color: white;">
<DIV CLASS="rich-page-header headerClass">
<DIV CLASS="rich-page-header-content">
<SPAN STYLE="font-size: 2em;">
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java 2009-11-04 12:16:48 UTC (rev 18405)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java 2009-11-04 14:42:41 UTC (rev 18406)
@@ -33,6 +33,10 @@
private EditorDomEventListener editorDomEventListener;
//possible events
+ public static final String MOZAFTERPAINT = "MozAfterPaint"; //$NON-NLS-1$
+
+ public static final String SCROLL = "scroll"; //$NON-NLS-1$
+
public static final String MOUSEMOVEEVENTTYPE="mousemove"; //$NON-NLS-1$
public static final String MOUSEDOWNEVENTTYPE="mousedown"; //$NON-NLS-1$
@@ -57,6 +61,7 @@
public static final String DRAGEXITEVENT = "dragexit"; //$NON-NLS-1$
+
void setEditorDomEventListener(EditorDomEventListener listener) {
editorDomEventListener = listener;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2009-11-04 12:16:48 UTC (rev 18405)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2009-11-04 14:42:41 UTC (rev 18406)
@@ -21,7 +21,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -35,8 +34,6 @@
import org.eclipse.swt.browser.ProgressEvent;
import org.eclipse.swt.browser.ProgressListener;
import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.graphics.Color;
@@ -47,7 +44,6 @@
import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.IFileEditorInput;
@@ -81,6 +77,7 @@
import org.mozilla.interfaces.nsIDOMNamedNodeMap;
import org.mozilla.interfaces.nsIDOMNode;
import org.mozilla.interfaces.nsIDOMNodeList;
+import org.mozilla.interfaces.nsIDOMWindow;
import org.mozilla.interfaces.nsIEditingSession;
import org.mozilla.interfaces.nsIEditor;
import org.mozilla.interfaces.nsIHTMLAbsPosEditor;
@@ -847,7 +844,6 @@
if (getContentAreaEventListener() != null) {
getContentAreaEventListener().setVisualEditor(xulRunnerEditor);
setContentAreaEventTarget((nsIDOMEventTarget) contentArea.queryInterface(nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID));
-
//add mozilla event handlers
getContentAreaEventTarget().addEventListener(MozillaDomEventListener.CLICKEVENTTYPE, getContentAreaEventListener(), false);
getContentAreaEventTarget().addEventListener(MozillaDomEventListener.MOUSEDOWNEVENTTYPE, getContentAreaEventListener(), false);
@@ -862,6 +858,12 @@
getContentAreaEventTarget().addEventListener(MozillaDomEventListener.DBLCLICK, getContentAreaEventListener(), false);
documentEventTarget = (nsIDOMEventTarget) xulRunnerEditor.getDOMDocument().queryInterface(nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID);
documentEventTarget.addEventListener(MozillaDomEventListener.KEYPRESS, getContentAreaEventListener(), false);
+ //as a fix of https://jira.jboss.org/jira/browse/JBIDE-4022
+ //scroll event listener was added for selection border redrawing
+ documentEventTarget.addEventListener(MozillaDomEventListener.SCROLL, getContentAreaEventListener(), false);
+ nsIDOMWindow window = xulRunnerEditor.getWebBrowser().getContentDOMWindow();
+ nsIDOMEventTarget eventTarget = (nsIDOMEventTarget) window.queryInterface(nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID);
+ eventTarget.addEventListener(MozillaDomEventListener.MOZAFTERPAINT, getContentAreaEventListener(), false);
} else {
//baseEventListener = new MozillaBaseEventListener();
}
@@ -884,7 +886,13 @@
if (xulRunnerEditor.getDOMDocument() != null && documentEventTarget != null) {
documentEventTarget.removeEventListener(MozillaDomEventListener.KEYPRESS, getContentAreaEventListener(), false);
+ documentEventTarget.removeEventListener(MozillaDomEventListener.SCROLL, getContentAreaEventListener(), false);
}
+ if ((xulRunnerEditor!=null) && (xulRunnerEditor.getWebBrowser()!= null)) {
+ nsIDOMWindow window = xulRunnerEditor.getWebBrowser().getContentDOMWindow();
+ nsIDOMEventTarget eventTarget = (nsIDOMEventTarget) window.queryInterface(nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID);
+ eventTarget.removeEventListener(MozillaDomEventListener.MOZAFTERPAINT, getContentAreaEventListener(), false);
+ }
getContentAreaEventListener().setVisualEditor(null);
getContentAreaEventListener().setEditorDomEventListener(null);
setContentAreaEventTarget(null);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2009-11-04 12:16:48 UTC (rev 18405)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2009-11-04 14:42:41 UTC (rev 18406)
@@ -760,30 +760,31 @@
// {
// return;
// }
- // restore style for previously bordered element
- if (this.lastBorderedElement != null
- && this.lastBorderedElement.getAttribute(STYLE_ATTR) != null) {
- String style = this.lastBorderedElement
- .getAttribute(PREV_STYLE_ATTR_NAME);
- this.lastBorderedElement.removeAttribute(PREV_STYLE_ATTR_NAME);
- this.lastBorderedElement.setAttribute(STYLE_ATTR, style);
- }
+ if (Platform.OS_MACOSX.equals(Platform.getOS())) {
+ // restore style for previously bordered element
+ if (this.lastBorderedElement != null
+ && this.lastBorderedElement.getAttribute(STYLE_ATTR) != null) {
+ String style = this.lastBorderedElement
+ .getAttribute(PREV_STYLE_ATTR_NAME);
+ this.lastBorderedElement.removeAttribute(PREV_STYLE_ATTR_NAME);
+ this.lastBorderedElement.setAttribute(STYLE_ATTR, style);
+ }
- // save style for early bordered element
- String oldstyle = domElement.getAttribute(STYLE_ATTR);
- if (flasherHiddentElementColor.equals(getIFlasher().getColor())) {
- domElement.setAttribute(STYLE_ATTR, domElement
- .getAttribute(STYLE_ATTR)
- + ';' + XulRunnerEditor.INVISIBLE_ELEMENT_BORDER);
+ // save style for early bordered element
+ String oldstyle = domElement.getAttribute(STYLE_ATTR);
+ if (flasherHiddentElementColor.equals(getIFlasher().getColor())) {
+ domElement.setAttribute(STYLE_ATTR, domElement
+ .getAttribute(STYLE_ATTR)
+ + ';' + XulRunnerEditor.INVISIBLE_ELEMENT_BORDER);
+ } else {
+ domElement.setAttribute(STYLE_ATTR, domElement
+ .getAttribute(STYLE_ATTR)
+ + ';' + XulRunnerEditor.VISIBLE_ELEMENT_BORDER);
+ }
+ this.lastBorderedElement = domElement;
+ this.lastBorderedElement.setAttribute(PREV_STYLE_ATTR_NAME, oldstyle);
} else {
- domElement.setAttribute(STYLE_ATTR, domElement
- .getAttribute(STYLE_ATTR)
- + ';' + XulRunnerEditor.VISIBLE_ELEMENT_BORDER);
- }
- this.lastBorderedElement = domElement;
- this.lastBorderedElement.setAttribute(PREV_STYLE_ATTR_NAME, oldstyle);
- // under osx function drawElementOutline not works
- if (!Platform.OS_MACOSX.equals(Platform.getOS())) {
+ // under osx function drawElementOutline not works
getIFlasher().drawElementOutline(domElement);
}
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/html.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/html.html.xml 2009-11-04 12:16:48 UTC (rev 18405)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/html.html.xml 2009-11-04 14:42:41 UTC (rev 18406)
@@ -1,6 +1,6 @@
<tests>
<test id="html">
- <DIV STYLE="border: 2px solid blue; -moz-user-modify: read-write;">
+ <DIV STYLE="-moz-user-modify: read-write;">
<DIV STYLE="display: none; -moz-user-modify: read-only;">
<BR VPE:PSEUDO-ELEMENT="yes"
STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
14 years, 6 months
JBoss Tools SVN: r18405 - trunk/seam/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2009-11-04 07:16:48 -0500 (Wed, 04 Nov 2009)
New Revision: 18405
Modified:
trunk/seam/docs/reference/en/modules/creating_new_seam.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-906 spelling is checked of the chapter
Modified: trunk/seam/docs/reference/en/modules/creating_new_seam.xml
===================================================================
--- trunk/seam/docs/reference/en/modules/creating_new_seam.xml 2009-11-04 12:15:14 UTC (rev 18404)
+++ trunk/seam/docs/reference/en/modules/creating_new_seam.xml 2009-11-04 12:16:48 UTC (rev 18405)
@@ -11,7 +11,7 @@
<title>Creating a New Seam Project via the New Seam Project wizard</title>
<para>In this chapter we provide you with the necessary steps to start working with Seam
Framework.</para>
- <para>At first, we suggest setting the specific Seam perspective that combines a number of
+ <para>At first, we suggest to set the specific Seam perspective that combines a number of
different views and editors needed for work with resources concerned. For that select
<emphasis>
<property>Window > Open Perspective > Other > Seam</property>
@@ -37,8 +37,8 @@
</figure>
<section id="standaloneSeam" role="updated">
<title>Create standalone Seam Web Project</title>
- <para>The best way to get started with Seam is to organise a simple Seam Project and
- experiment with it by creating variations.</para>
+ <para>The best way to get started with Seam is to create a simple Seam Project and
+ experiment with it.</para>
<para>Thus, you should select <emphasis>
<property>File > New > Seam Web Project</property>
</emphasis> to run the <property>New Seam Project</property> wizard. The wizard form
@@ -62,7 +62,7 @@
<property>New...</property>
</emphasis> button in the <property>Target Runtime</property> section. It brings up the
wizard where you can specify a new JBoss Server Runtime environment or the other type of
- runtime appropriate for configuring your project. Let's create one more JBoss 4.2
+ runtime appropriate for your project configuration. Let's create one more JBoss 4.2
Runtime. Hence, after choosing it click on <emphasis>
<property>Next</property>
</emphasis> button.</para>
@@ -91,12 +91,12 @@
<property>Finish</property>
</emphasis> returns you to the <link linkend="figure_create_seam1">New Seam Project
wizard page</link>.</para>
- <para>The next step is to define a Server that you can do by clicking on <emphasis>
+ <para>The next step is to define a Server by clicking on <emphasis>
<property>New...</property>
</emphasis> button in the <property>Target Server</property> section. In appeared
<property>New Server dialog</property> the last server which matches the runtime
will be selected.</para>
- <para>All declared runtimes are listed in the combo box under the servers view. Here, you
+ <para>All declared runtimes are listed in the combo-box under the servers view. Here, you
can indicate a server runtime that you need. Click <emphasis>
<property>Add</property>
</emphasis> if you want to add a new Server Runtime.</para>
@@ -108,7 +108,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>Next page allows you to verify the information for chosen server. Leave everything as
+ <para>Next page allows you to verify the information for a chosen server. Leave everything as
it is and click on <emphasis>
<property>Next</property>
</emphasis>.</para>
@@ -136,7 +136,7 @@
wizard</property>.</para>
<tip>
<title>Tip:</title>
- <para>We suggest that you look through our <ulink url="&aslink;">AS manager
+ <para>We suggest that you look through <ulink url="&aslink;">AS manager
guide</ulink> to find out more about runtimes and servers.</para>
</tip>
<figure>
@@ -157,9 +157,9 @@
<para>Pass to the next section to find out more details on this dialog.</para>
</section>
<section id="projectFacets">
- <title>Select the Project Facets</title>
+ <title>Selecting the Project Facets</title>
<para>The <property>Project Facets wizard</property> allows you to enable or disable
- specific facets which define necessary characteristics for the project. In time you
+ specific facets which define necessary features for the project. When you
switch to this wizard form, all critical facets are already checked for the chosen
Configuration.</para>
<para>Notice that this page of the wizard also allows you to set the necessary version for
@@ -187,12 +187,12 @@
<para>To see all available Server runtimes click on <property>Runtimes</property> tab on the
left. You can create a new one using the <emphasis>
<property>New</property>
- </emphasis> button. If more than one runtimes are checked here, the <emphasis>
+ </emphasis> button. If more than one runtime is checked here, the <emphasis>
<property>Make Primary</property>
- </emphasis> button won't be dimmed yet. So you can make use of it to mark primary
+ </emphasis> button won't be dimmed yet. Thus, you can make use of it to mark primary
runtime.</para>
<figure>
- <title>Runtime Manipulations</title>
+ <title>Setting Runtime</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/create_new_seam/create_seam_16.png"/>
@@ -206,8 +206,8 @@
</section>
<section id="configureJava">
<title>Java application building configuration</title>
- <para>With this wizard you can define Java source directories, which will be generated on
- build path. Also you can specify default output folder. If you are agree with default
+ <para>With this wizard you can define Java source directories which will be generated on
+ build path. Also you can specify a default output folder. If you are agree with default
values, press <property>Next</property></para>
<figure>
<title>Java application building Wizard</title>
@@ -220,11 +220,11 @@
</section>
<section id="configureWebModule">
<title>How to Configure Web Module Settings</title>
- <para> As we deal with a Dynamic Web Application we should first specify the top level
+ <para> As we deal with a Dynamic Web Application, we should at first specify the top level
directory of our application for deploying it to a server afterwards. You know, this
kind of application contains Web resources. Thus, it's important to indicate the content
- directory. The wizard will put all those values itself. So you can leave everything as
- it is.</para>
+ directory. The wizard will put all those values itself, so you can leave everything as
+ is.</para>
<figure>
<title>Web Module Settings</title>
<mediaobject>
@@ -239,11 +239,10 @@
</section>
<section id="addJSFCapab">
<title>Adding JSF Capabilities</title>
- <para>This wizard helps you to add JSF capabilities into your project for representing
- appropriate behaviours associated with JSF. </para>
+ <para>This wizard helps you to add JSF capabilities to your project. </para>
<para>Choose <emphasis>
<property>Library provided by Target Runtime</property>
- </emphasis> from Library Type list if you want have a default JSF implementation
+ </emphasis> from Library Type list if you'd like to use a default JSF implementation
given by the present runtime.</para>
<figure>
<title>Adding JSF Capabilities to Web Project</title>
@@ -253,7 +252,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>In case when you prefer to use your custom JSF implementation choose <property>User
+ <para>In case if you prefer to use your custom JSF implementation, choose <property>User
Library</property> Item from Library Type list. In User Library list you can check
required library.</para>
<figure>
@@ -264,7 +263,7 @@
</imageobject>
</mediaobject>
</figure>
- <para> If you want to add new library click <property>Manage libraries...</property> ( <inlinemediaobject>
+ <para> If a new library is required, click <property>Manage libraries...</property> ( <inlinemediaobject>
<imageobject>
<imagedata fileref="images/create_new_seam/create_seam_17a.png"/>
</imageobject>
@@ -287,7 +286,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>To add proper <property>Library JARs</property> click <property>Add JARs...</property>
+ <para>To add proper <property>Library JARs</property>, click <property>Add JARs...</property>
button and select the JARs on your hard drive. </para>
<figure>
<title>Selection Library JARs</title>
@@ -297,7 +296,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>Also you can download necessary JSF implementation libraries provided by Sun and Apache Foundation. For this you need click <property>Download...</property> (<inlinemediaobject>
+ <para>You can download necessary JSF implementation libraries provided by Sun and Apache Foundation as well. Click <property>Download...</property> (<inlinemediaobject>
<imageobject>
<imagedata fileref="images/create_new_seam/create_seam_23a.png"/>
</imageobject>
@@ -321,7 +320,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>Finally, as we are arranging the Seam Web project, the last step we should do is to
+ <para>Since we are arranging the Seam Web project, the last step we should do is to
adjust project configurations associated with the Seam.</para>
</section>
<section id="seamFacet">
@@ -343,8 +342,8 @@
</itemizedlist>
<para>For that click on <emphasis>
<property>Add</property>
- </emphasis> button in the <property>General</property> section. Notice that in this
- wizard presented below you can create a Seam runtime only for that version which was
+ </emphasis> button in the <property>General</property> section. Note, in the
+ wizard shown below you can create a Seam runtime only for the version that was
selected in the <link linkend="projectFacets">Project Facets</link> wizard (version 1.2
in our case).</para>
<figure>
@@ -401,7 +400,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>On the other dialog you'll be asked to enter its name and description. And then
+ <para>On the dialog you'll be asked to enter its name and description. And then
you should select a proper driver and adjust connection details. Press <emphasis>
<property>Next</property>
</emphasis> to preview all the adjusted settings and complete the creation of the new
@@ -416,10 +415,10 @@
</figure>
<para>The next block of settings in the Seam Facet wizard are describing a Database and a
connection to it.</para>
- <para>In the <property>Code Generation</property> section the wizard have already put the
+ <para>In the <property>Code Generation</property> section the wizard has already provided the
names for your <property>Session Bean</property>, <property>Entity Bean</property> and
- <property>Test</property> packages. Of course, you can change them into the others
- which you like.</para>
+ <property>Test</property> packages. Of course, you can change them on others
+ of your choice.</para>
<figure>
<title>Code Generation Section</title>
<mediaobject>
14 years, 6 months
JBoss Tools SVN: r18404 - trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-11-04 07:15:14 -0500 (Wed, 04 Nov 2009)
New Revision: 18404
Modified:
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/ELReferencesQueryParticipant.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5093
Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/ELReferencesQueryParticipant.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/ELReferencesQueryParticipant.java 2009-11-04 12:04:51 UTC (rev 18403)
+++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/refactoring/ELReferencesQueryParticipant.java 2009-11-04 12:15:14 UTC (rev 18404)
@@ -25,15 +25,13 @@
import org.eclipse.jdt.ui.search.IQueryParticipant;
import org.eclipse.jdt.ui.search.ISearchRequestor;
import org.eclipse.jdt.ui.search.QuerySpecification;
-import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.search.ui.text.Match;
-import org.eclipse.ui.PartInitException;
import org.jboss.tools.common.el.core.refactoring.ELProjectSetExtension;
import org.jboss.tools.common.el.core.refactoring.ProjectsSet;
import org.jboss.tools.common.el.core.refactoring.RefactorSearcher;
import org.jboss.tools.common.model.project.ProjectHome;
-public class ELReferencesQueryParticipant implements IQueryParticipant, IMatchPresentation{
+public class ELReferencesQueryParticipant implements IQueryParticipant{
private ELSearcher searcher;
public int estimateTicks(QuerySpecification specification) {
@@ -41,7 +39,7 @@
}
public IMatchPresentation getUIParticipant() {
- return this;
+ return null;
}
public void search(ISearchRequestor requestor,
@@ -62,14 +60,6 @@
}
}
- public ILabelProvider createLabelProvider() {
- return null;
- }
-
- public void showMatch(Match match, int currentOffset,
- int currentLength, boolean activate) throws PartInitException {
- }
-
class ELSearcher extends RefactorSearcher{
ISearchRequestor requestor;
ProjectsSet projectSet=null;
14 years, 6 months