JBoss Tools SVN: r16254 - trunk/jsf/docs/userguide/en/images/visual_page.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2009-06-29 11:20:14 -0400 (Mon, 29 Jun 2009)
New Revision: 16254
Modified:
trunk/jsf/docs/userguide/en/images/visual_page/edited_properties.png
trunk/jsf/docs/userguide/en/images/visual_page/preview_box.png
trunk/jsf/docs/userguide/en/images/visual_page/preview_tab.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_18.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_19.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_20.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_21.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_22.png
trunk/jsf/docs/userguide/en/images/visual_page/visual_page_7.png
Log:
https://jira.jboss.org/jira/browse/JBDS-752 - screenshots updated
Modified: trunk/jsf/docs/userguide/en/images/visual_page/edited_properties.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/preview_box.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/preview_tab.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_18.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_19.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_20.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_21.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_22.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_7.png
===================================================================
(Binary files differ)
16 years, 5 months
JBoss Tools SVN: r16253 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-06-29 11:13:48 -0400 (Mon, 29 Jun 2009)
New Revision: 16253
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java 2009-06-29 15:11:06 UTC (rev 16252)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/ActionProposalType.java 2009-06-29 15:13:48 UTC (rev 16253)
@@ -19,6 +19,9 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.KbQuery;
import org.jboss.tools.jst.web.kb.WebKbPlugin;
@@ -43,8 +46,16 @@
if (!isReadyToUse()) {
return EMPTY_PROPOSAL_LIST;
}
+ XModelObject xModelObject = EclipseResourceUtil.getObjectByResource(context.getResource());
+ if(xModelObject==null) {
+ return EMPTY_PROPOSAL_LIST;
+ }
+ String path = XModelObjectLoaderUtil.getResourcePath(xModelObject);
+ if(path==null) {
+ return EMPTY_PROPOSAL_LIST;
+ }
Properties view = new Properties();
- view.put(IWebPromptingProvider.VIEW_PATH, context.getResource().getFullPath().removeFirstSegments(1).toString());
+ view.put(IWebPromptingProvider.VIEW_PATH, path);
List<Object> sourceList = provider.getList(xModel, WebPromptingProvider.JSF_VIEW_ACTIONS, "", view);
if (sourceList != null && !sourceList.isEmpty()) {
Set<String> sorted = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
16 years, 5 months
JBoss Tools SVN: r16252 - in trunk: jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-06-29 11:11:06 -0400 (Mon, 29 Jun 2009)
New Revision: 16252
Modified:
trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultProviderTest.java
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/helpers/TilesDefinitionSet.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/RemoveJavaSource.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateResourcesStep.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateVelocityStep.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/version/ProjectVersions.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/OpenFileHyperLinkListener.java
Log:
catch (Exception e) blocks were replaced for particular exceptions
Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultProviderTest.java
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultProviderTest.java 2009-06-29 15:09:42 UTC (rev 16251)
+++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/tests/DefaultProviderTest.java 2009-06-29 15:11:06 UTC (rev 16252)
@@ -106,7 +106,7 @@
ExtensionManager.getProvider(DefaultConnectionProvider.PROVIDER_ID);
HashMap map = new HashMap();
map.put(DefaultConnectionProvider.ID, "Test Connection");
- map.put(DefaultConnectionProvider.URL, "service:jmx:rmi:///jndi/rmi://localhost:9999" +
+ map.put(DefaultConnectionProvider.URL, "service:jmx:rmi:///jndi/rmi://127.0.0.1:9999" +
"/jmxrmi");
map.put(DefaultConnectionProvider.USERNAME, "");
map.put(DefaultConnectionProvider.PASSWORD, "");
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java 2009-06-29 15:09:42 UTC (rev 16251)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddPageTemplateSupport.java 2009-06-29 15:11:06 UTC (rev 16252)
@@ -127,17 +127,12 @@
if(pagePath == null) return null;
if(pagePath.equals(this.pagePath)) return selectedFile;
this.pagePath = pagePath;
- try {
- IResource r = ModelPlugin.getWorkspace().getRoot().findMember(new Path(pagePath));
- if(r instanceof IFile) {
- selectedFile = (IFile)r;
- } else {
- selectedFile = null;
- }
- } catch (Exception e) {
- WebModelPlugin.getPluginLog().logError(e);
+ IResource r = ModelPlugin.getWorkspace().getRoot().findMember(new Path(pagePath));
+ if(r instanceof IFile) {
+ selectedFile = (IFile)r;
+ } else {
selectedFile = null;
- }
+ }
return selectedFile;
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateResourcesStep.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateResourcesStep.java 2009-06-29 15:09:42 UTC (rev 16251)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateResourcesStep.java 2009-06-29 15:11:06 UTC (rev 16252)
@@ -61,7 +61,7 @@
}
}
- void matchResources(IContainer r, Set included) throws Exception {
+ void matchResources(IContainer r, Set included) throws CoreException {
String path = r.getFullPath().toString();
if(!included.contains(path)) {
excludedResources.add(path);
@@ -89,7 +89,7 @@
excludedResources.clear();
try {
matchResources(root, list);
- } catch (Exception e) {
+ } catch (CoreException e) {
WebModelPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateVelocityStep.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateVelocityStep.java 2009-06-29 15:09:42 UTC (rev 16251)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateVelocityStep.java 2009-06-29 15:11:06 UTC (rev 16252)
@@ -39,19 +39,15 @@
root = p;
if(root == null || !root.isOpen()) return;
StringBuffer sb = new StringBuffer();
- try {
- IResource r = p.findMember("WebContent/WEB-INF/web.xml");
- if(r != null) {
- sb.append(r.getFullPath().toString());
- }
- r = p.findMember("ant/build.xml");
- if(r != null) {
- if(sb.length() > 0) sb.append(';');
- sb.append(r.getFullPath().toString());
- }
- } catch (Exception e) {
- WebModelPlugin.getPluginLog().logError(e);
+ IResource r = p.findMember("WebContent/WEB-INF/web.xml");
+ if(r != null) {
+ sb.append(r.getFullPath().toString());
}
+ r = p.findMember("ant/build.xml");
+ if(r != null) {
+ if(sb.length() > 0) sb.append(';');
+ sb.append(r.getFullPath().toString());
+ }
support.setAttributeValue(id, ATTR_NAME, sb.toString());
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java 2009-06-29 15:09:42 UTC (rev 16251)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/helpers/NewWebProjectHelper.java 2009-06-29 15:11:06 UTC (rev 16252)
@@ -12,7 +12,10 @@
import java.io.File;
import java.io.FileFilter;
+import java.io.FileNotFoundException;
import java.io.FileReader;
+import java.io.IOException;
+import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -140,7 +143,7 @@
map.put(name.substring(0, ext.length()-1), file.toURL().toString());
}
}
- } catch (Exception e) {
+ } catch (MalformedURLException e) {
WebModelPlugin.getPluginLog().logError(e);
}
}
@@ -157,21 +160,22 @@
File webXML = new File(location, "web.xml");
if(!webXML.isFile()) return modules;
try {
- WebAppConfig config = new WebAppConfig(webXML);
- Element[] servlets = config.getServletsByClass("org.apache.struts.action.ActionServlet");
- for (int i = 0; i < servlets.length; i++) {
- Map<String,String> params = config.getInitParamsAsMap(servlets[i]);
- Iterator<String> it = params.keySet().iterator();
- while (it.hasNext()) {
- String name = it.next();
- if (!name.startsWith("config/") && !name.equals("config")) continue;
- String value = params.get(name);
- modules.put(name.substring(6), value);
- }
- }
- } catch (Exception e) {
- WebModelPlugin.getPluginLog().logError(e);
- }
+ WebAppConfig config = new WebAppConfig(webXML);
+ Element[] servlets = config.getServletsByClass("org.apache.struts.action.ActionServlet");
+ for (int i = 0; i < servlets.length; i++) {
+ Map<String,String> params = config.getInitParamsAsMap(servlets[i]);
+ Iterator<String> it = params.keySet().iterator();
+ while (it.hasNext()) {
+ String name = it.next();
+ if (!name.startsWith("config/") && !name.equals("config")) continue;
+ String value = params.get(name);
+ modules.put(name.substring(6), value);
+ }
+ }
+ } catch (FileNotFoundException e) {
+ WebModelPlugin.getPluginLog().logError(e);
+ }
+
return modules;
}
@@ -208,7 +212,7 @@
Class<?> c = WebAppConfig.class;
XMLEntityResolver.registerPublicEntity("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", FileLocator.resolve(c.getResource("/meta/web-app_2_2.dtd")).toString());
XMLEntityResolver.registerPublicEntity("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", FileLocator.resolve(c.getResource("/meta/web-app_2_3.dtd")).toString());
- } catch (Exception e) {
+ } catch (IOException e) {
WebModelPlugin.getPluginLog().logError(e);
}
}
@@ -220,11 +224,11 @@
public WebAppConfig() {
}
- public WebAppConfig(File confFile) throws Exception {
+ public WebAppConfig(File confFile) throws FileNotFoundException {
load(confFile);
}
- public void load(File confFile) throws Exception {
+ public void load(File confFile) throws FileNotFoundException {
conf = XMLUtil.getDocument(new FileReader(confFile));
webApp = conf.getDocumentElement();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/version/ProjectVersions.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/version/ProjectVersions.java 2009-06-29 15:09:42 UTC (rev 16251)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/version/ProjectVersions.java 2009-06-29 15:11:06 UTC (rev 16252)
@@ -10,16 +10,22 @@
******************************************************************************/
package org.jboss.tools.jst.web.project.version;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
import org.eclipse.osgi.util.NLS;
-import org.w3c.dom.*;
-import org.jboss.tools.common.model.util.*;
+import org.jboss.tools.common.model.util.XMLUtil;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.common.xml.XMLUtilities;
import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.messages.xpl.WebUIMessages;
import org.jboss.tools.jst.web.project.handlers.AddVersionSupport;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
public abstract class ProjectVersions {
protected String descriptorFileName;
@@ -41,7 +47,7 @@
public String getPath() {
try {
return new File(path).getCanonicalPath().replace('\\', '/');
- } catch (Exception e) {
+ } catch (IOException e) {
WebModelPlugin.getPluginLog().logError(e);
return path;
}
@@ -66,7 +72,7 @@
String[] errors = XMLUtil.getXMLErrors(reader, false);
errorMessage = (errors == null || errors.length == 0) ? NLS.bind(WebUIMessages.CANNOT_PARSE_PROJECT_VERSIONS_DESCRIPTORFILE, file.getAbsolutePath())
: NLS.bind(WebUIMessages.CANNOT_PARSE_PROJECT_VERSIONS_DESCRIPTORFILE, file.getAbsolutePath()) + ":\n" + errors[0]; //$NON-NLS-1$
- } catch (Exception exc) {
+ } catch (IOException exc) {
WebModelPlugin.getPluginLog().logError(exc);
errorMessage = NLS.bind(WebUIMessages.CANNOT_READ_PROJECT_VERSIONS_DESCRIPTORFILE, file.getAbsolutePath());
}
@@ -102,7 +108,7 @@
}
try {
return f.getCanonicalPath().replace('\\', '/');
- } catch (Exception e) {
+ } catch (IOException e) {
WebModelPlugin.getPluginLog().logError(e);
return f.getAbsolutePath().replace('\\', '/');
}
@@ -112,7 +118,7 @@
if(document == null) return;
try {
XModelObjectLoaderUtil.serialize(document.getDocumentElement(), file.getAbsolutePath());
- } catch (Exception e) {
+ } catch (IOException e) {
WebModelPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/helpers/TilesDefinitionSet.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/helpers/TilesDefinitionSet.java 2009-06-29 15:09:42 UTC (rev 16251)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/src/org/jboss/tools/jst/web/tiles/model/helpers/TilesDefinitionSet.java 2009-06-29 15:11:06 UTC (rev 16252)
@@ -124,11 +124,7 @@
if(!removed.isEmpty() || !added.isEmpty()) {
ITilesDefinitionSetListener[] ls = listeners.toArray(new ITilesDefinitionSetListener[0]);
for (int i = 0; i < ls.length; i++) {
- try {
- ls[i].definitionsChanged(removed, added);
- } catch (Exception e) {
- ModelPlugin.getPluginLog().logError(e);
- }
+ ls[i].definitionsChanged(removed, added);
}
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/RemoveJavaSource.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/RemoveJavaSource.java 2009-06-29 15:09:42 UTC (rev 16251)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/RemoveJavaSource.java 2009-06-29 15:11:06 UTC (rev 16252)
@@ -14,11 +14,11 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
-import org.jboss.tools.jst.web.WebModelPlugin;
import org.jboss.tools.jst.web.ui.WebUiPlugin;
public class RemoveJavaSource {
@@ -42,7 +42,7 @@
for (int i = 0; i < rs.length; i++) {
try {
if(rs[i] != null) rs[i].delete(true, null);
- } catch (Exception ce) {
+ } catch (CoreException ce) {
WebUiPlugin.getPluginLog().logError(ce);
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/OpenFileHyperLinkListener.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/OpenFileHyperLinkListener.java 2009-06-29 15:09:42 UTC (rev 16251)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/OpenFileHyperLinkListener.java 2009-06-29 15:11:06 UTC (rev 16252)
@@ -7,6 +7,7 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.xml.type.AnyType;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.ui.PartInitException;
import org.eclipse.ui.forms.events.HyperlinkEvent;
import org.eclipse.ui.forms.events.IHyperlinkListener;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
@@ -50,7 +51,7 @@
try {
IResource resource = SmooksUIUtils.getResource((EObject) model);
SmooksUIUtils.openFile(path, resource.getProject(), editorID);
- } catch (Exception e1) {
+ } catch (PartInitException e1) {
}
}
16 years, 5 months
JBoss Tools SVN: r16251 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2009-06-29 11:09:42 -0400 (Mon, 29 Jun 2009)
New Revision: 16251
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1077
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-06-29 14:45:59 UTC (rev 16250)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-06-29 15:09:42 UTC (rev 16251)
@@ -134,11 +134,8 @@
return lastChange;
}
- ArrayList<IPath> files = new ArrayList<IPath>();
-
protected void findDeclarations(ISeamComponent component) throws CoreException{
- files.clear();
- findDeclarations(component, true);
+ changeDeclarations(component);
if(declarationFile == null)
return;
@@ -151,7 +148,7 @@
if(seamProject != null){
ISeamComponent comp = seamProject.getComponent(getOldName());
if(comp != null)
- findDeclarations(comp, false);
+ changeDeclarations(comp);
}
}
}
@@ -165,72 +162,58 @@
if(seamProject == null)
return;
- files.clear();
- findInFactoryAnnotations(seamProject, true);
+ findInFactoryAnnotations(seamProject);
IProject[] projects = projectsSet.getAllProjects();
for (IProject project : projects) {
ISeamProject sProject = SeamCorePlugin.getSeamProject(project, true);
if(sProject != null){
- findInFactoryAnnotations(sProject, false);
+ findInFactoryAnnotations(sProject);
}
}
}
- private void findInFactoryAnnotations(ISeamProject seamProject, boolean force){
+ private void findInFactoryAnnotations(ISeamProject seamProject){
// find @In annotations
- findAnnotations(seamProject, force, BijectedAttributeType.IN, SeamAnnotations.IN_ANNOTATION_TYPE);
+ findAnnotations(seamProject, BijectedAttributeType.IN, SeamAnnotations.IN_ANNOTATION_TYPE);
- findFactories(seamProject, force);
+ findFactories(seamProject);
}
- private void findFactories(ISeamProject seamProject, boolean force){
+ private void findFactories(ISeamProject seamProject){
// find @Factory annotations
Set<ISeamFactory> factorySet = seamProject.getFactoriesByName(getOldName());
for(ISeamFactory factory : factorySet){
- changeFactory(factory, force);
+ changeFactory(factory);
}
}
- private void findAnnotations(ISeamProject seamProject, boolean force, BijectedAttributeType type, String locationPath){
+ private void findAnnotations(ISeamProject seamProject, BijectedAttributeType type, String locationPath){
Set<IBijectedAttribute> inSet = seamProject.getBijectedAttributesByName(getOldName(), type);
for(IBijectedAttribute inAtt : inSet){
ITextSourceReference location = inAtt.getLocationFor(locationPath);
- if(location != null){
- if(!files.contains(inAtt.getResource().getFullPath())){
- files.add(inAtt.getResource().getFullPath());
- changeAnnotation(location, (IFile)inAtt.getResource());
- }else if(force)
- changeAnnotation(location, (IFile)inAtt.getResource());
- }
+ if(location != null)
+ changeAnnotation(location, (IFile)inAtt.getResource());
}
}
- private void changeFactory(ISeamFactory factory, boolean force){
+ private void changeFactory(ISeamFactory factory){
IFile file = (IFile)factory.getResource();
if(file.getFileExtension().equalsIgnoreCase(JAVA_EXT)){
ITextSourceReference location = factory.getLocationFor(SeamAnnotations.FACTORY_ANNOTATION_TYPE);
- if(location != null){
- if(!files.contains(file.getFullPath())){
- files.add(file.getFullPath());
- changeAnnotation(location, file);
- }else if(force)
- changeAnnotation(location, file);
- }
+ if(location != null)
+ changeAnnotation(location, file);
+
}else{
ITextSourceReference location = factory.getLocationFor(ISeamXmlComponentDeclaration.NAME);
- if(location != null){
- if(!files.contains(file.getFullPath())){
- files.add(file.getFullPath());
- changeXMLNode(location, file);
- }else if(force)
- changeXMLNode(location, file);
- }
+ if(location != null)
+ changeXMLNode(location, file);
+
}
}
@@ -253,20 +236,15 @@
return;
}
- TextFileChange change = getChange(file);
-
String text = content.substring(location.getStartPosition(), location.getStartPosition()+location.getLength());
if(text.startsWith("<")){ //$NON-NLS-1$
int position = text.lastIndexOf("/>"); //$NON-NLS-1$
if(position < 0){
position = text.lastIndexOf(">"); //$NON-NLS-1$
}
-
- TextEdit edit = new ReplaceEdit(location.getStartPosition()+position, 0, " name=\""+getNewName()+"\""); //$NON-NLS-1$ //$NON-NLS-2$
- change.addEdit(edit);
+ change(file, location.getStartPosition()+position, 0, " name=\""+getNewName()+"\""); //$NON-NLS-1$ //$NON-NLS-2$
}else{
- TextEdit edit = new ReplaceEdit(location.getStartPosition(), location.getLength(), getNewName());
- change.addEdit(edit);
+ change(file, location.getStartPosition(), location.getLength(), getNewName());
}
}
@@ -285,8 +263,6 @@
return;
}
- TextFileChange change = getChange(file);
-
String text = content.substring(location.getStartPosition(), location.getStartPosition()+location.getLength());
int openBracket = text.indexOf("("); //$NON-NLS-1$
if(openBracket > 0){
@@ -297,46 +273,33 @@
if(closeBracket == openBracket+1){ // empty brackets
String newText = "\""+getNewName()+"\""; //$NON-NLS-1$ //$NON-NLS-2$
- TextEdit edit = new ReplaceEdit(location.getStartPosition()+openBracket+1, 0, newText);
- change.addEdit(edit);
+ change(file, location.getStartPosition()+openBracket+1, 0, newText);
}else if(value > 0){ // construction value="name" found so change name
String newText = text.replace(getOldName(), getNewName());
- TextEdit edit = new ReplaceEdit(location.getStartPosition(), location.getLength(), newText);
- change.addEdit(edit);
+ change(file, location.getStartPosition(), location.getLength(), newText);
}else if(equals > 0){ // other parameters are found
String newText = "value=\""+getNewName()+"\","; //$NON-NLS-1$ //$NON-NLS-2$
- TextEdit edit = new ReplaceEdit(location.getStartPosition()+openBracket+1, 0, newText);
- change.addEdit(edit);
+ change(file, location.getStartPosition()+openBracket+1, 0, newText);
}else{ // other cases
String newText = text.replace(getOldName(), getNewName());
- TextEdit edit = new ReplaceEdit(location.getStartPosition(), location.getLength(), newText);
- change.addEdit(edit);
+ change(file, location.getStartPosition(), location.getLength(), newText);
}
}else{
String newText = "(\""+getNewName()+"\")"; //$NON-NLS-1$ //$NON-NLS-2$
- TextEdit edit = new ReplaceEdit(location.getStartPosition()+location.getLength(), 0, newText);
- change.addEdit(edit);
+ change(file, location.getStartPosition()+location.getLength(), 0, newText);
}
}
- private void findDeclarations(ISeamComponent component, boolean force) throws CoreException{
- if(component.getJavaDeclaration() != null){
- if(!files.contains(component.getJavaDeclaration().getResource().getFullPath())){
- files.add(component.getJavaDeclaration().getResource().getFullPath());
- renameJavaDeclaration(component.getJavaDeclaration());
- }else if(force)
- renameJavaDeclaration(component.getJavaDeclaration());
- }
+ private void changeDeclarations(ISeamComponent component) throws CoreException{
+ if(component.getJavaDeclaration() != null)
+ renameJavaDeclaration(component.getJavaDeclaration());
+
Set<ISeamXmlComponentDeclaration> xmlDecls = component.getXmlDeclarations();
for(ISeamXmlComponentDeclaration xmlDecl : xmlDecls){
- if(!files.contains(xmlDecl.getResource().getFullPath())){
- files.add(xmlDecl.getResource().getFullPath());
- renameXMLDeclaration(xmlDecl);
- }else if(force)
- renameXMLDeclaration(xmlDecl);
+ renameXMLDeclaration(xmlDecl);
}
}
@@ -373,11 +336,8 @@
if(file != null && !coreHelper.isJar(javaDecl)){
ITextSourceReference location = ((SeamComponentDeclaration)javaDecl).getLocationFor(ISeamXmlComponentDeclaration.NAME);
- if(location != null && !isBadLocation(location)){
- TextFileChange change = getChange(file);
- TextEdit edit = new ReplaceEdit(location.getStartPosition(), location.getLength(), "\""+getNewName()+"\""); //$NON-NLS-1$ //$NON-NLS-2$
- change.addEdit(edit);
- }
+ if(location != null && !isBadLocation(location))
+ change(file, location.getStartPosition(), location.getLength(), "\""+getNewName()+"\""); //$NON-NLS-1$ //$NON-NLS-2$
}
declarationFile = file;
}
@@ -611,11 +571,8 @@
for (ELInstance instance : model.getInstances()) {
for(ELInvocationExpression ie : instance.getExpression().getInvocations()){
ELPropertyInvocation pi = findComponentReference(ie);
- if(pi != null){
- TextFileChange change = getChange(file);
- TextEdit edit = new ReplaceEdit(offset+pi.getStartPosition(), pi.getName().getStart()+pi.getName().getLength()-pi.getStartPosition(), newName);
- change.addEdit(edit);
- }
+ if(pi != null)
+ change(file, offset+pi.getStartPosition(), pi.getName().getStart()+pi.getName().getLength()-pi.getStartPosition(), newName);
}
}
}
@@ -668,9 +625,7 @@
if(key && token.startsWith(getOldName())){
String changeText = token.replaceFirst(getOldName(), getNewName());
- TextFileChange change = getChange(file);
- TextEdit edit = new ReplaceEdit(offset, token.length(), changeText);
- change.addEdit(edit);
+ change(file, offset, token.length(), changeText);
}
}
@@ -681,6 +636,9 @@
protected void renameComponent(IProgressMonitor pm, ISeamComponent component)throws CoreException{
pm.beginTask("", 3);
+
+ clearChanges();
+
findDeclarations(component);
pm.worked(1);
@@ -694,20 +652,11 @@
pm.done();
}
- protected void renameFactories(IProgressMonitor pm, Set<ISeamFactory> factories){
- pm.beginTask("", factories.size()+1);
-
- for(ISeamFactory factory : factories){
- changeFactory(factory, true);
- pm.worked(1);
- }
-
- pm.done();
- }
-
protected void renameSeamContextVariable(IProgressMonitor pm, IFile sourceFile)throws CoreException{
pm.beginTask("", 2);
+ clearChanges();
+
declarationFile = sourceFile;
findOutDataModelFactory();
@@ -728,19 +677,30 @@
if(seamProject == null)
return;
- files.clear();
- findAnnotations(seamProject, true, BijectedAttributeType.OUT, SeamAnnotations.OUT_ANNOTATION_TYPE);
- findAnnotations(seamProject, true, BijectedAttributeType.DATA_BINDER, "name"/*SeamAnnotations.DATA_MODEL_ANNOTATION_TYPE*/);
- findFactories(seamProject, true);
-
IProject[] projects = projectsSet.getAllProjects();
for (IProject project : projects) {
ISeamProject sProject = SeamCorePlugin.getSeamProject(project, true);
if(sProject != null){
- findAnnotations(sProject, false, BijectedAttributeType.OUT, SeamAnnotations.OUT_ANNOTATION_TYPE);
- findAnnotations(sProject, false, BijectedAttributeType.DATA_BINDER, "name"/*SeamAnnotations.DATA_MODEL_ANNOTATION_TYPE*/);
- findFactories(sProject, false);
+ findAnnotations(sProject, BijectedAttributeType.OUT, SeamAnnotations.OUT_ANNOTATION_TYPE);
+ findAnnotations(sProject, BijectedAttributeType.DATA_BINDER, "name"/*SeamAnnotations.DATA_MODEL_ANNOTATION_TYPE*/);
+ findFactories(sProject);
}
}
}
+
+ ArrayList<String> keys = new ArrayList<String>();
+
+ private void clearChanges(){
+ keys.clear();
+ }
+
+ private void change(IFile file, int offset, int length, String text){
+ String key = file.getFullPath().toString()+" "+offset;
+ if(!keys.contains(key)){
+ TextFileChange change = getChange(file);
+ TextEdit edit = new ReplaceEdit(offset, length, text);
+ change.addEdit(edit);
+ keys.add(key);
+ }
+ }
}
16 years, 5 months
JBoss Tools SVN: r16250 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-06-29 10:45:59 -0400 (Mon, 29 Jun 2009)
New Revision: 16250
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateResourcesStep.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateSupport.java
Log:
catch (Exception e) blocks were replaced for particular exceptions
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateResourcesStep.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateResourcesStep.java 2009-06-29 14:41:50 UTC (rev 16249)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateResourcesStep.java 2009-06-29 14:45:59 UTC (rev 16250)
@@ -12,11 +12,13 @@
import java.io.File;
import java.io.FileFilter;
+import java.io.IOException;
import java.util.*;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.common.meta.action.impl.MultistepWizardStep;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.project.IModelNature;
@@ -54,7 +56,7 @@
if(r != null) excludedResources.add(r.getFullPath().toString());
r = root.findMember("WebContent/WEB-INF/classes");
if(r != null) excludedResources.add(r.getFullPath().toString());
- } catch (Exception e) {
+ } catch (CoreException e) {
WebModelPlugin.getPluginLog().logError(e);
}
}
@@ -102,7 +104,7 @@
File f = r.getLocation().toFile();
try {
set.add(f.getCanonicalPath());
- } catch (Exception e) {
+ } catch (IOException e) {
WebModelPlugin.getPluginLog().logError(e);
}
}
@@ -117,7 +119,7 @@
String path = null;
try {
path = pathname.getCanonicalPath();
- } catch (Exception e) {
+ } catch (IOException e) {
WebModelPlugin.getPluginLog().logError(e);
}
return path != null && !set.contains(path);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateSupport.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateSupport.java 2009-06-29 14:41:50 UTC (rev 16249)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/handlers/AddProjectTemplateSupport.java 2009-06-29 14:45:59 UTC (rev 16250)
@@ -86,7 +86,7 @@
setVersionList();
try {
prepareStep(RESOURCES_STEP);
- } catch (Exception e) {
+ } catch (XModelException e) {
WebModelPlugin.getPluginLog().logError(e);
}
}
16 years, 5 months
JBoss Tools SVN: r16249 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-06-29 10:41:50 -0400 (Mon, 29 Jun 2009)
New Revision: 16249
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-29 14:36:32 UTC (rev 16248)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-29 14:41:50 UTC (rev 16249)
@@ -93,6 +93,20 @@
/*
* (non-Javadoc)
+ * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#getMatchString(org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion, org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion, int)
+ */
+ @Override
+ protected String getMatchString(IStructuredDocumentRegion parent, ITextRegion aRegion, int offset) {
+ String matchString = super.getMatchString(parent, aRegion, offset);
+ String regionType = aRegion.getType();
+ if(regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE && matchString.equals("\"")) {
+ matchString = ""; //$NON-NLS-1$
+ }
+ return matchString;
+ }
+
+ /*
+ * (non-Javadoc)
* @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
*/
@Override
16 years, 5 months
JBoss Tools SVN: r16248 - in trunk: profiler/plugins/org.jboss.tools.profiler.ui/src/org/jboss/tools/profiler/internal/ui/launchtabs and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-06-29 10:36:32 -0400 (Mon, 29 Jun 2009)
New Revision: 16248
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java
trunk/profiler/plugins/org.jboss.tools.profiler.ui/src/org/jboss/tools/profiler/internal/ui/launchtabs/BaseBlock.java
Log:
catch (Exception e) blocks were replaced for particular exceptions
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java 2009-06-29 14:04:57 UTC (rev 16247)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java 2009-06-29 14:36:32 UTC (rev 16248)
@@ -15,10 +15,12 @@
import java.net.URL;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.ui.PartInitException;
import org.eclipse.ui.browser.IWebBrowser;
import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
import org.eclipse.wst.server.core.*;
@@ -102,7 +104,7 @@
try {
Object launchable = as[i].getLaunchable(server, resource);
if(launchable instanceof HttpLaunchable) return (HttpLaunchable)launchable;
- } catch (Exception e) {
+ } catch (CoreException e) {
WebModelPlugin.getPluginLog().logError(e);
}
}
@@ -122,18 +124,16 @@
return;
}
if(!checkUrl()) return;
- try {
- server.getModules();
- } catch (Exception e) {
- WebModelPlugin.getPluginLog().logError(e);
- }
+
+ server.getModules();
+
String launchMode = ILaunchManager.DEBUG_MODE.equals(server.getMode()) ? ILaunchManager.DEBUG_MODE : ILaunchManager.RUN_MODE;
try {
Object launchable = new HttpLaunchable(new URL(lastRunUrl));
IClient[] clients = getClients(server, launchable, launchMode);
IClient client = clients[0];
client.launch(server, launchable, launchMode, server.getLaunch());
- } catch (Exception e) {
+ } catch (MalformedURLException e) {
WebModelPlugin.getPluginLog().logError(e);
runJustUrl();
}
@@ -164,7 +164,7 @@
} catch (MalformedURLException mue) {
ServiceDialog d = PreferenceModelUtilities.getPreferenceModel().getService();
d.showDialog(WebUIMessages.ERROR, NLS.bind(WebUIMessages.INCORRECT_URL, mue.getMessage()), new String[]{WebUIMessages.OK}, null, ServiceDialog.ERROR); //$NON-NLS-3$
- } catch (Exception e) {
+ } catch (PartInitException e) {
WebModelPlugin.getPluginLog().logError(e);
}
}
Modified: trunk/profiler/plugins/org.jboss.tools.profiler.ui/src/org/jboss/tools/profiler/internal/ui/launchtabs/BaseBlock.java
===================================================================
--- trunk/profiler/plugins/org.jboss.tools.profiler.ui/src/org/jboss/tools/profiler/internal/ui/launchtabs/BaseBlock.java 2009-06-29 14:04:57 UTC (rev 16247)
+++ trunk/profiler/plugins/org.jboss.tools.profiler.ui/src/org/jboss/tools/profiler/internal/ui/launchtabs/BaseBlock.java 2009-06-29 14:36:32 UTC (rev 16248)
@@ -1,6 +1,7 @@
package org.jboss.tools.profiler.internal.ui.launchtabs;
import java.io.File;
+import java.io.IOException;
import org.eclipse.core.filesystem.URIUtil;
import org.eclipse.core.resources.IContainer;
@@ -108,24 +109,25 @@
.getStringVariableManager()
.performStringSubstitution(getLocation(), false);
File f = new File(path);
- if (f.exists())
+ if (f.exists()) {
Program.launch(f.getCanonicalPath());
- else
- MessageDialog.openWarning(JBossProfilerUiPlugin
- .getActiveWorkbenchShell(),
- isFile() ? Messages.BaseBlock_open_file : Messages.BaseBlock_open_directory,
- isFile() ? Messages.BaseBlock_file_not_found
- : Messages.BaseBlock_directory_not_found);
- } catch (Exception ex) {
- MessageDialog
- .openWarning(
- JBossProfilerUiPlugin
- .getActiveWorkbenchShell(),
- isFile() ? Messages.BaseBlock_open_file : Messages.BaseBlock_open_directory,
- isFile() ? Messages.BaseBlock_cannot_open_file
- : Messages.BaseBlock_cannot_open_directory);
+ } else {
+ openWarning();
+ }
+ } catch (CoreException ex) {
+ openWarning();
+ } catch (IOException ioex) {
+ openWarning();
}
}
+
+ private void openWarning() {
+ MessageDialog.openWarning(JBossProfilerUiPlugin
+ .getActiveWorkbenchShell(),
+ isFile() ? Messages.BaseBlock_open_file : Messages.BaseBlock_open_directory,
+ isFile() ? Messages.BaseBlock_file_not_found
+ : Messages.BaseBlock_directory_not_found);
+ }
});
}
16 years, 5 months
JBoss Tools SVN: r16247 - in workspace/yzhishko: org.jboss.tools.vpe.ui.auto.test/src/org/jboss/tools/vpe/ui/auto/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2009-06-29 10:04:57 -0400 (Mon, 29 Jun 2009)
New Revision: 16247
Modified:
workspace/yzhishko/org.jboss.tools.ui.runtime.auto.test/src/org/jboss/tools/ui/runtime/auto/test/JBossRuntimeStartup.java
workspace/yzhishko/org.jboss.tools.vpe.ui.auto.test/src/org/jboss/tools/vpe/ui/auto/test/VPEAutoTestCase.java
Log:
JBOSS_EAP_HOME property has been changed
Modified: workspace/yzhishko/org.jboss.tools.ui.runtime.auto.test/src/org/jboss/tools/ui/runtime/auto/test/JBossRuntimeStartup.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.ui.runtime.auto.test/src/org/jboss/tools/ui/runtime/auto/test/JBossRuntimeStartup.java 2009-06-29 13:22:38 UTC (rev 16246)
+++ workspace/yzhishko/org.jboss.tools.ui.runtime.auto.test/src/org/jboss/tools/ui/runtime/auto/test/JBossRuntimeStartup.java 2009-06-29 14:04:57 UTC (rev 16247)
@@ -52,7 +52,7 @@
InputStream inputStream = Platform.getBundle(Activator.PLUGIN_ID).getResource(RUNTIME_PROPERTIES).openStream();
Properties properties = new Properties();
properties.load(inputStream);
- JBOSS_EAP_HOME = System.getProperty("jbosstools.test.jboss.home.eap", properties.getProperty("JBossEap4.3"));
+ JBOSS_EAP_HOME = System.getProperty("jbosstools.test.jboss.home", properties.getProperty("JBossEap4.3"));
} catch (IOException e) {
IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Can't load properties from " + RUNTIME_PROPERTIES + " file", e);
Activator.getDefault().getLog().log(status);
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.auto.test/src/org/jboss/tools/vpe/ui/auto/test/VPEAutoTestCase.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.auto.test/src/org/jboss/tools/vpe/ui/auto/test/VPEAutoTestCase.java 2009-06-29 13:22:38 UTC (rev 16246)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.auto.test/src/org/jboss/tools/vpe/ui/auto/test/VPEAutoTestCase.java 2009-06-29 14:04:57 UTC (rev 16247)
@@ -34,7 +34,7 @@
} catch (IllegalStateException e) {
fail("Property file " + PROJECT_PROPERTIES + " was not found");
}
- JBOSS_EAP_HOME = System.getProperty("jbosstools.test.jboss.home.eap",projectProperties.getProperty("JBossEap4.3"));
+ JBOSS_EAP_HOME = System.getProperty("jbosstools.test.jboss.home",projectProperties.getProperty("JBossEap4.3"));
}
protected void setUp() throws Exception {
16 years, 5 months
JBoss Tools SVN: r16246 - in workspace/yzhishko: org.jboss.tools.seam.ui.auto.test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: anis
Date: 2009-06-29 09:22:38 -0400 (Mon, 29 Jun 2009)
New Revision: 16246
Added:
workspace/yzhishko/org.jboss.tools.seam.ui.auto.test/
workspace/yzhishko/org.jboss.tools.seam.ui.auto.test/.classpath
workspace/yzhishko/org.jboss.tools.seam.ui.auto.test/.project
workspace/yzhishko/org.jboss.tools.seam.ui.auto.test/build.properties
Log:
Added a Seam tests folder
Added: workspace/yzhishko/org.jboss.tools.seam.ui.auto.test/.classpath
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.auto.test/.classpath (rev 0)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.auto.test/.classpath 2009-06-29 13:22:38 UTC (rev 16246)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="resources"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: workspace/yzhishko/org.jboss.tools.seam.ui.auto.test/.project
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.auto.test/.project (rev 0)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.auto.test/.project 2009-06-29 13:22:38 UTC (rev 16246)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.seam.ui.auto.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: workspace/yzhishko/org.jboss.tools.seam.ui.auto.test/build.properties
===================================================================
--- workspace/yzhishko/org.jboss.tools.seam.ui.auto.test/build.properties (rev 0)
+++ workspace/yzhishko/org.jboss.tools.seam.ui.auto.test/build.properties 2009-06-29 13:22:38 UTC (rev 16246)
@@ -0,0 +1,4 @@
+source.. = src/,resources/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
16 years, 5 months
JBoss Tools SVN: r16245 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-06-29 09:09:42 -0400 (Mon, 29 Jun 2009)
New Revision: 16245
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2808
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-29 13:08:01 UTC (rev 16244)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AbstractXMLContentAssistProcessor.java 2009-06-29 13:09:42 UTC (rev 16245)
@@ -62,6 +62,8 @@
private int fDocumentPosition;
private ELContext fContext;
+ protected final static ICompletionProposal[] EMPTY_PROPOSAL_LIST = new ICompletionProposal[0];
+
/*
* (non-Javadoc)
* @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int)
@@ -71,21 +73,8 @@
int offset) {
this.fDocument = (viewer == null ? null : viewer.getDocument());
this.fDocumentPosition = offset;
- try {
- this.fContext = createContext();
- } catch (Exception e) {
- e.printStackTrace();
- return new ICompletionProposal[0];
- }
- System.out.println("AbstractXMLContentAssistProcessor: computeCompletionProposals() invoked");
- try {
- return super.computeCompletionProposals(viewer, offset);
- } catch (Exception e) {
- e.printStackTrace();
- return new ICompletionProposal[0];
- } finally {
- System.out.println("AbstractXMLContentAssistProcessor: computeCompletionProposals() exited");
- }
+ this.fContext = createContext();
+ return super.computeCompletionProposals(viewer, offset);
}
/*
@@ -98,7 +87,7 @@
this.fDocument = (viewer == null ? null : viewer.getDocument());
this.fDocumentPosition = offset;
this.fContext = createContext();
-
+
return super.computeContextInformation(viewer, offset);
}
@@ -715,7 +704,7 @@
}
}
- protected class TextRegion {
+ protected static class TextRegion {
private int startOffset;
private int offset;
private int length;
@@ -787,5 +776,4 @@
return is.getEndPosition();
}
-
}
\ No newline at end of file
16 years, 5 months