JBoss Tools SVN: r19188 - trunk/jsf/docs/userguide/en/images/web_projects.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-12-10 10:54:00 -0500 (Thu, 10 Dec 2009)
New Revision: 19188
Modified:
trunk/jsf/docs/userguide/en/images/web_projects/web_projects_15a.png
trunk/jsf/docs/userguide/en/images/web_projects/web_projects_15b.png
Log:
https://jira.jboss.org/jira/browse/JBDS-814 - updating the images as the "Set Expend" command was changed to "Expand";
Modified: trunk/jsf/docs/userguide/en/images/web_projects/web_projects_15a.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/web_projects/web_projects_15b.png
===================================================================
(Binary files differ)
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19187 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-12-10 10:51:48 -0500 (Thu, 10 Dec 2009)
New Revision: 19187
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5289
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-12-10 15:50:08 UTC (rev 19186)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-12-10 15:51:48 UTC (rev 19187)
@@ -35,6 +35,8 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner;
import org.eclipse.jdt.ui.text.IJavaPartitions;
import org.eclipse.jface.text.BadLocationException;
@@ -49,6 +51,7 @@
import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController;
import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TLDCMDocumentManager;
import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TaglibTracker;
+import org.eclipse.ui.ide.IDE;
import org.eclipse.wst.common.componentcore.internal.ComponentResource;
import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
@@ -72,10 +75,13 @@
import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
import org.jboss.tools.common.el.core.ELReference;
import org.jboss.tools.common.el.core.GlobalELReferenceList;
+import org.jboss.tools.common.el.core.model.ELExpression;
import org.jboss.tools.common.el.core.model.ELInstance;
+import org.jboss.tools.common.el.core.model.ELInvocationExpression;
import org.jboss.tools.common.el.core.model.ELModel;
import org.jboss.tools.common.el.core.parser.ELParser;
import org.jboss.tools.common.el.core.parser.ELParserUtil;
+import org.jboss.tools.common.el.core.parser.SyntaxError;
import org.jboss.tools.common.el.core.resolver.ELContext;
import org.jboss.tools.common.el.core.resolver.ELContextImpl;
import org.jboss.tools.common.el.core.resolver.ELResolverFactoryManager;
@@ -112,31 +118,31 @@
public static final String XML_PAGE_CONTEXT_TYPE = "XML_PAGE_CONTEXT_TYPE"; //$NON-NLS-1$
public static final String JSP_PAGE_CONTEXT_TYPE = "JSP_PAGE_CONTEXT_TYPE"; //$NON-NLS-1$
public static final String FACELETS_PAGE_CONTEXT_TYPE = "FACELETS_PAGE_CONTEXT_TYPE"; //$NON-NLS-1$
- private static final String JAVA_EXT = "java"; //$NON-NLS-1$
+ private static final String JAVA_PROPERTIES_CONTENT_TYPE = "org.eclipse.jdt.core.javaProperties"; //$NON-NLS-1$
public static final PageContextFactory getInstance() {
if (fInstance != null)
return fInstance;
return (fInstance = new PageContextFactory());
}
-
+
private PageContextFactory() {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
if (workspace != null) workspace.addResourceChangeListener(this);
}
-
+
/*
* The cache to store the created contexts
* The key is IFile.getFullPath().toString() of the resource of the context
*/
private Map<IFile, ELContext> cache = new HashMap<IFile, ELContext>();
-
+
private ELContext getSavedContext(IFile resource) {
synchronized (cache) {
return cache.get(resource);
}
}
-
+
private void saveConvext(ELContext context) {
if (context != null && context.getResource() != null) {
// int size = 0; // remove this line
@@ -149,10 +155,10 @@
// + context.getResource().getFullPath().toString() + ", " + context.getClass().getSimpleName() + ", Totals: " + size);
}
}
-
+
private ELContext removeSavedContext(IFile resource) {
ELContext removedContext = null; // Remove this line
-
+
synchronized (cache) {
removedContext = cache.remove(resource);
if (removedContext instanceof XmlContextImpl &&
@@ -160,14 +166,14 @@
((XmlContextImpl)removedContext).getDocument().removeDocumentListener(this);
}
}
-
+
// if (removedContext != null) { // TODO: Remove this statement
// System.out.println("Removed Context : " + removedContext.getResource().getFullPath().toString() + ", " + removedContext.getClass().getSimpleName() + ", Totals: " + cache.size());
// }
return removedContext;
}
-
+
/**
* Creates a page context for the specified context type
*
@@ -178,7 +184,7 @@
public static ELContext createPageContext(IFile file) {
return getInstance().createPageContext(file, null);
}
-
+
/**
* Cleans up the context for the file specified
*
@@ -191,7 +197,7 @@
ELContext removedContext = removeSavedContext(file);
if (removedContext == null || removedContext.getResource() == null)
return;
-
+
// Remove all the contexts that are parent to the removed context
ELContext[] contexts = cache.values().toArray(new ELContext[0]);
if (contexts != null) {
@@ -203,7 +209,7 @@
}
}
}
-
+
/**
* Cleans up the contexts for the project specified
*
@@ -224,7 +230,7 @@
}
}
}
-
+
/**
* Cleans up the contexts for the resource change delta
*
@@ -238,6 +244,45 @@
}
}
+ private ELContext createPropertiesContext(IFile file) {
+ ELContextImpl context = new ELContextImpl();
+ context.setResource(file);
+ context.setElResolvers(ELResolverFactoryManager.getInstance().getResolvers(file));
+ String content = null;
+ try {
+ content = FileUtil.readStream(file);
+ int startEl = content.indexOf("#{"); //$NON-NLS-1$
+ if(startEl<0)
+ startEl = content.indexOf("${"); //$NON-NLS-1$
+ if(startEl>-1) {
+ ELParser parser = ELParserUtil.getJbossFactory().createParser();
+ ELModel model = parser.parse(content);
+ List<SyntaxError> errors = model.getSyntaxErrors();
+ for (ELInstance instance : model.getInstances()) {
+ for(ELInvocationExpression ie : instance.getExpression().getInvocations()){
+ ELReference elReference = new KbELReference();
+ elReference.setResource(file);
+ elReference.setEl(new ELExpression[]{ie});
+ elReference.setLength(ie.getLength());
+ elReference.setStartPosition(ie.getStartPosition());
+ List<SyntaxError> elErrors = new ArrayList<SyntaxError>();
+ for (SyntaxError error : errors) {
+ if(error.getPosition()>=ie.getStartPosition() && error.getPosition()<=ie.getEndPosition()) {
+ elErrors.add(error);
+ }
+ }
+ elReference.setSyntaxErrors(elErrors);
+ context.addELReference(elReference);
+ }
+ }
+ }
+ } catch (CoreException e) {
+ WebKbPlugin.getDefault().logError(e);
+ return null;
+ }
+ return context;
+ }
+
private ELContext createJavaContext(IFile file) {
ELContextImpl context = new ELContextImpl();
context.setResource(file);
@@ -305,12 +350,13 @@
if (context != null) {
return context;
}
+ IContentType type = IDE.getContentType(file);
- String ext = file.getFileExtension();
- if(ext.equalsIgnoreCase(JAVA_EXT)) {
+ if(JavaCore.JAVA_SOURCE_CONTENT_TYPE.equalsIgnoreCase(type.getId())) {
context = createJavaContext(file);
+ } else if(JAVA_PROPERTIES_CONTENT_TYPE.equalsIgnoreCase(type.getId())) {
+ context = createPropertiesContext(file);
} else {
-
// ctm = System.currentTimeMillis();
// System.out.println("Create Context : " + file.getFullPath().toString() + ", Totals: " + cache.size());
IModelManager manager = StructuredModelManager.getModelManager();
@@ -326,19 +372,19 @@
if (model instanceof IDOMModel) {
IDOMModel domModel = (IDOMModel) model;
IDOMDocument document = domModel.getDocument();
-
+
context = createPageContextInstance(domModel.getContentTypeIdentifier());
if (context == null)
return null;
-
+
context.setResource(file);
context.setElResolvers(ELResolverFactoryManager.getInstance().getResolvers(file));
-
+
if (context instanceof JspContextImpl && !(context instanceof FaceletPageContextImpl)) {
// Fill JSP namespaces defined in TLDCMDocumentManager
fillJSPNameSpaces((JspContextImpl)context);
}
-
+
// The subsequently called functions may use the file and document
// already stored in context for their needs
fillContextForChildNodes(document, context, parents);
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19186 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-12-10 10:50:08 -0500 (Thu, 10 Dec 2009)
New Revision: 19186
Modified:
trunk/jsf/docs/userguide/en/modules/web_projects.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-814 - the "Set Expended" command for the taglibs in the Web Projects view was changed to "Expend";
Modified: trunk/jsf/docs/userguide/en/modules/web_projects.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/web_projects.xml 2009-12-10 15:44:26 UTC (rev 19185)
+++ trunk/jsf/docs/userguide/en/modules/web_projects.xml 2009-12-10 15:50:08 UTC (rev 19186)
@@ -201,7 +201,7 @@
<title>Expanding Tag Library Files</title>
-<para>You can easily expand any TLD file in the project. Browse to the Tag Libraries folder. Right-click a TLD file and select <emphasis><property>Set Expanded</property></emphasis>:</para>
+<para>You can easily expand any TLD file in the project. Browse to the Tag Libraries folder. Right-click a TLD file and select <emphasis><property>Expand</property></emphasis>:</para>
<figure>
<title>Expanding Tag Library File</title>
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19185 - trunk/jsf/docs/userguide/en/images/visual_page.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-12-10 10:44:26 -0500 (Thu, 10 Dec 2009)
New Revision: 19185
Added:
trunk/jsf/docs/userguide/en/images/visual_page/contentAssistXHTMLpages1.png
trunk/jsf/docs/userguide/en/images/visual_page/customFacelets1.png
trunk/jsf/docs/userguide/en/images/visual_page/customFacelets2.png
trunk/jsf/docs/userguide/en/images/visual_page/customFacelets3.png
trunk/jsf/docs/userguide/en/images/visual_page/customFacelets4.png
trunk/jsf/docs/userguide/en/images/visual_page/customFacelets5.png
Log:
https://jira.jboss.org/jira/browse/JBDS-814 - adding new images for a new section, "Support for Custom Facelets Components";
Added: trunk/jsf/docs/userguide/en/images/visual_page/contentAssistXHTMLpages1.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/contentAssistXHTMLpages1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/customFacelets1.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/customFacelets1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/customFacelets2.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/customFacelets2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/customFacelets3.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/customFacelets3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/customFacelets4.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/customFacelets4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/userguide/en/images/visual_page/customFacelets5.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/customFacelets5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19184 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-12-10 10:08:01 -0500 (Thu, 10 Dec 2009)
New Revision: 19184
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java
Log:
Fixed KB Messages
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java 2009-12-10 13:52:03 UTC (rev 19183)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/KbMessages.java 2009-12-10 15:08:01 UTC (rev 19184)
@@ -16,7 +16,7 @@
* @author Alexey Kazakov
*/
public class KbMessages {
- private static final String BUNDLE_NAME = "org.jboss.tools.jst.web.kb.KBMessages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = "org.jboss.tools.jst.web.kb.KbMessages"; //$NON-NLS-1$
static {
NLS.initializeMessages(BUNDLE_NAME, KbMessages.class);
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19183 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram: editors and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-12-10 08:52:03 -0500 (Thu, 10 Dec 2009)
New Revision: 19183
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.properties
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5384 - fixed
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.properties 2009-12-10 12:47:46 UTC (rev 19182)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/DiagramViewerMessages.properties 2009-12-10 13:52:03 UTC (rev 19183)
@@ -47,5 +47,5 @@
Diagram_incorrect_state=incorrect Hibernate Console Configuration state.
Diagram_no_items_or_incorrect_state=no items or incorrect Hibernate Console Configuration state.
OpenDiagramActionDelegate_could_not_load_configuration=Could not load configuration
-ConnectionRouterFanAction_select_fan_connection_router=Select fan connection router
-ConnectionRouterManhattanAction_select_manhattan_connection_router=Select manhattan connection router
+ConnectionRouterFanAction_select_fan_connection_router=Show connections as straight lines
+ConnectionRouterManhattanAction_select_manhattan_connection_router=Show connections as routed
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java 2009-12-10 12:47:46 UTC (rev 19182)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramActionBarContributor.java 2009-12-10 13:52:03 UTC (rev 19183)
@@ -162,14 +162,14 @@
ConnectionRouterFanAction.img, IAction.AS_RADIO_BUTTON);
addRetargetAction(diagramAction);
//
- act = new Action[7];
+ act = new Action[4];
act[0] = (Action)getAction(TogglePropertyMappingAction.ACTION_ID);
act[1] = (Action)getAction(ToggleClassMappingAction.ACTION_ID);
act[2] = (Action)getAction(ToggleAssociationAction.ACTION_ID);
act[3] = (Action)getAction(ToggleForeignKeyConstraintAction.ACTION_ID);
- act[4] = null;
- act[5] = (Action)getAction(ConnectionRouterManhattanAction.ACTION_ID);
- act[6] = (Action)getAction(ConnectionRouterFanAction.ACTION_ID);
+ //act[4] = null;
+ //act[5] = (Action)getAction(ConnectionRouterManhattanAction.ACTION_ID);
+ //act[6] = (Action)getAction(ConnectionRouterFanAction.ACTION_ID);
diagramToggleConnectionsAction.setMenuCreator(new ActionMenu(act));
//
//act = new Action[2];
@@ -244,6 +244,9 @@
viewMenu.add(getAction(GEFActionConstants.TOGGLE_RULER_VISIBILITY));
viewMenu.add(getAction(GEFActionConstants.TOGGLE_GRID_VISIBILITY));
viewMenu.add(getAction(GEFActionConstants.TOGGLE_SNAP_TO_GEOMETRY));
+ viewMenu.add(new Separator());
+ viewMenu.add(getAction(ConnectionRouterManhattanAction.ACTION_ID));
+ viewMenu.add(getAction(ConnectionRouterFanAction.ACTION_ID));
menubar.insertAfter(IWorkbenchActionConstants.M_EDIT, viewMenu);
}
}
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-12-10 12:47:46 UTC (rev 19182)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-12-10 13:52:03 UTC (rev 19183)
@@ -300,14 +300,14 @@
action = new LexicalSortingAction(this, null);
registry.registerAction(action);
- Action[] act = new Action[7];
+ Action[] act = new Action[4];
act[0] = (Action)registry.getAction(TogglePropertyMappingAction.ACTION_ID);
act[1] = (Action)registry.getAction(ToggleClassMappingAction.ACTION_ID);
act[2] = (Action)registry.getAction(ToggleAssociationAction.ACTION_ID);
act[3] = (Action)registry.getAction(ToggleForeignKeyConstraintAction.ACTION_ID);
- act[4] = null;
- act[5] = (Action)registry.getAction(ConnectionRouterManhattanAction.ACTION_ID);
- act[6] = (Action)registry.getAction(ConnectionRouterFanAction.ACTION_ID);
+ //act[4] = null;
+ //act[5] = (Action)registry.getAction(ConnectionRouterManhattanAction.ACTION_ID);
+ //act[6] = (Action)registry.getAction(ConnectionRouterFanAction.ACTION_ID);
actionToggleConnections.setMenuCreator(new ActionMenu(act));
//act = new Action[2];
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java 2009-12-10 12:47:46 UTC (rev 19182)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java 2009-12-10 13:52:03 UTC (rev 19183)
@@ -16,7 +16,6 @@
import org.eclipse.gef.EditPartViewer;
import org.eclipse.gef.editparts.AbstractTreeEditPart;
import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator;
@@ -51,8 +50,13 @@
* @author Vitali Yemialyanchyk
*/
public class PopupMenuProvider extends ContextMenuProvider {
- private ActionRegistry actionRegistry;
+ public static final String GROUP_OPEN_SOURCE = "open_source"; //$NON-NLS-1$
+ public static final String GROUP_EDIT = "edit"; //$NON-NLS-1$
+ public static final String GROUP_ADDITIONAL_ACTIONS = "additional_actions"; //$NON-NLS-1$
+
+ private ActionRegistry actionRegistry;
+
public PopupMenuProvider(EditPartViewer viewer, ActionRegistry actionRegistry) {
super(viewer);
this.actionRegistry = actionRegistry;
@@ -61,10 +65,11 @@
@SuppressWarnings("unchecked")
public void buildContextMenu(IMenuManager menu) {
+ menu.add(new Separator(GROUP_OPEN_SOURCE));
+ menu.add(new Separator(GROUP_EDIT));
+ menu.add(new Separator(GROUP_ADDITIONAL_ACTIONS));
// Add standard action groups to the menu
- GEFActionConstants.addStandardActionGroups(menu);
-
- menu.add(new Separator(GEFActionConstants.MB_ADDITIONS));
+ //GEFActionConstants.addStandardActionGroups(menu);
IAction action = null;
if (getViewer().getSelection() instanceof StructuredSelection) {
Shape selectedShape = null;
@@ -88,11 +93,11 @@
|| first instanceof Table
|| first instanceof Column) {
action = getActionRegistry().getAction(OpenSourceAction.ACTION_ID);
- appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
+ appendToGroup(GROUP_OPEN_SOURCE, action);
createMenuItem(getMenu(), action);
action = getActionRegistry().getAction(OpenMappingAction.ACTION_ID);
- appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
+ appendToGroup(GROUP_OPEN_SOURCE, action);
createMenuItem(getMenu(), action);
}
}
@@ -120,34 +125,34 @@
}
if (addToggleVisibleStateMenu) {
action = getActionRegistry().getAction(ToggleShapeVisibleStateAction.ACTION_ID);
- appendToGroup(GEFActionConstants.GROUP_EDIT, action);
+ appendToGroup(GROUP_EDIT, action);
createMenuItem(getMenu(), action);
}
if (addToggleExpandStateMenu) {
action = getActionRegistry().getAction(ToggleShapeExpandStateAction.ACTION_ID);
- appendToGroup(GEFActionConstants.GROUP_EDIT, action);
+ appendToGroup(GROUP_EDIT, action);
createMenuItem(getMenu(), action);
}
}
action = getActionRegistry().getAction(ToggleConnectionsAction.ACTION_ID);
- appendToGroup(GEFActionConstants.GROUP_EDIT, action);
+ appendToGroup(GROUP_EDIT, action);
createMenuItem(getMenu(), action);
action = getActionRegistry().getAction(AutoLayoutAction.ACTION_ID);
- appendToGroup(GEFActionConstants.GROUP_VIEW, action);
+ appendToGroup(GROUP_ADDITIONAL_ACTIONS, action);
createMenuItem(getMenu(), action);
//action = getActionRegistry().getAction(CollapseAllAction.ACTION_ID);
- //appendToGroup(GEFActionConstants.GROUP_VIEW, action);
+ //appendToGroup(GROUP_EDIT, action);
//createMenuItem(getMenu(), action);
//action = getActionRegistry().getAction(ExpandAllAction.ACTION_ID);
- //appendToGroup(GEFActionConstants.GROUP_VIEW, action);
+ //appendToGroup(GROUP_EDIT, action);
//createMenuItem(getMenu(), action);
action = getActionRegistry().getAction(ExportImageAction.ACTION_ID);
- appendToGroup(GEFActionConstants.MB_ADDITIONS, action);
+ appendToGroup(GROUP_ADDITIONAL_ACTIONS, action);
createMenuItem(getMenu(), action);
// Add actions to the menu
@@ -161,7 +166,7 @@
getAction(ActionFactory.REDO.getId()));
/**/
menu.appendToGroup(
- GEFActionConstants.GROUP_VIEW, // target group id
+ GROUP_EDIT, // target group id
getAction(ActionFactory.SELECT_ALL.getId())); // action to add
}
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19182 - in trunk: jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-12-10 07:47:46 -0500 (Thu, 10 Dec 2009)
New Revision: 19182
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/SimpleELContext.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IXmlContext.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5289
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/SimpleELContext.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/SimpleELContext.java 2009-12-10 11:10:09 UTC (rev 19181)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/SimpleELContext.java 2009-12-10 12:47:46 UTC (rev 19182)
@@ -33,6 +33,10 @@
return elResolvers;
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.common.el.core.resolver.ELContext#setElResolvers(org.jboss.tools.common.el.core.resolver.ELResolver[])
+ */
public void setElResolvers(ELResolver[] elResolvers) {
this.elResolvers = elResolvers;
}
@@ -45,6 +49,10 @@
return resource;
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.common.el.core.resolver.ELContext#setResource(org.eclipse.core.resources.IFile)
+ */
public void setResource(IFile resource) {
this.resource = resource;
}
@@ -57,8 +65,9 @@
return vars.toArray(new Var[vars.size()]);
}
- /**
- * @param vars
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.common.el.core.resolver.ELContext#setVars(java.util.List)
*/
public void setVars(List<Var> vars) {
this.vars = vars;
@@ -72,11 +81,18 @@
vars.add(var);
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.common.el.core.resolver.ELContext#getELReferences()
+ */
public ELReference[] getELReferences() {
- // TODO Auto-generated method stub
return null;
}
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.common.el.core.resolver.ELContext#getVars(int)
+ */
public Var[] getVars(int offset) {
return getVars();
}
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-12-10 11:10:09 UTC (rev 19181)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2009-12-10 12:47:46 UTC (rev 19182)
@@ -13,7 +13,6 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.eclipse.core.resources.IContainer;
@@ -27,13 +26,6 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner;
-import org.eclipse.jdt.ui.text.IJavaPartitions;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.Token;
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
@@ -44,11 +36,8 @@
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.jboss.tools.common.el.core.ELReference;
import org.jboss.tools.common.el.core.model.ELExpression;
-import org.jboss.tools.common.el.core.model.ELInstance;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
-import org.jboss.tools.common.el.core.model.ELModel;
import org.jboss.tools.common.el.core.model.ELPropertyInvocation;
-import org.jboss.tools.common.el.core.parser.ELParser;
import org.jboss.tools.common.el.core.parser.ELParserFactory;
import org.jboss.tools.common.el.core.parser.ELParserUtil;
import org.jboss.tools.common.el.core.parser.LexicalToken;
@@ -65,15 +54,12 @@
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector;
import org.jboss.tools.common.el.core.resolver.Var;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jsf.preferences.JSFSeverityPreferences;
import org.jboss.tools.jsf.project.JSFNature;
import org.jboss.tools.jst.web.kb.IKbProject;
-import org.jboss.tools.jst.web.kb.IXmlContext;
import org.jboss.tools.jst.web.kb.KbProjectFactory;
import org.jboss.tools.jst.web.kb.PageContextFactory;
-import org.jboss.tools.jst.web.kb.el.KbELReference;
import org.jboss.tools.jst.web.kb.internal.KbProject;
import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper;
import org.jboss.tools.jst.web.kb.internal.validation.ValidatingProjectSet;
@@ -94,7 +80,6 @@
private ELResolver[] resolvers;
protected ELParserFactory mainFactory;
- private List<Var> varListForCurentValidatedNode = new ArrayList<Var>();
private IProject currentProject;
private IResource[] currentSources;
private IContainer webRootFolder;
@@ -262,111 +247,26 @@
}
removeAllMessagesFromResource(file);
displaySubtask(JSFValidationMessages.VALIDATING_EL_FILE, new String[]{file.getProject().getName(), file.getName()});
- String ext = file.getFileExtension();
- String content = null;
- try {
- content = FileUtil.readStream(file);
- } catch (CoreException e) {
- JSFModelPlugin.getDefault().logError(e);
- }
-
- if(ext.equalsIgnoreCase(JAVA_EXT)) {
- validateJava(file, content);
- } else {
- validateDom(file, content);
- }
- }
-
- private void validateEL(ELReference el) {
- el.deleteMarkers();
- for (ELExpression expresion : el.getEl()) {
- validateELExpression(el, expresion);
- }
- }
-
- private void validateJava(IFile file, String content) {
- try {
- FastJavaPartitionScanner scaner = new FastJavaPartitionScanner();
- Document document = new Document(content);
- scaner.setRange(document, 0, document.getLength());
- IToken token = scaner.nextToken();
- while(token!=null && token!=Token.EOF && !reporter.isCancelled()) {
- if(IJavaPartitions.JAVA_STRING.equals(token.getData())) {
- int length = scaner.getTokenLength();
- int offset = scaner.getTokenOffset();
- String value = document.get(offset, length);
- if(value.indexOf('{')>-1) {
- validateString(file, value, offset);
- }
- }
- token = scaner.nextToken();
- }
- } catch (BadLocationException e) {
- JSFModelPlugin.getDefault().logError(JSFValidationMessages.EL_VALIDATOR_ERROR_VALIDATING, e);
- }
- }
-
- private void validateDom(IFile file, String content) {
ELContext context = PageContextFactory.createPageContext(file);
- if(context==null) {
- return;
- }
- if(context instanceof IXmlContext) {
- IXmlContext xmlContext = (IXmlContext)context;
- ELReference[] references = xmlContext.getELReferences();
+ if(context!=null) {
+ ELReference[] references = context.getELReferences();
for (int i = 0; i < references.length; i++) {
if(!references[i].getSyntaxErrors().isEmpty()) {
for (SyntaxError error: references[i].getSyntaxErrors()) {
- IMarker marker = addError(JSFValidationMessages.EL_SYNTAX_ERROR, JSFSeverityPreferences.EL_SYNTAX_ERROR, new String[]{"" + error.getProblem()}, 1, references[i].getStartPosition() + error.getPosition(), file);
+ IMarker marker = addError(JSFValidationMessages.EL_SYNTAX_ERROR, JSFSeverityPreferences.EL_SYNTAX_ERROR, new String[]{"" + error.getProblem()}, 1, references[i].getStartPosition() + error.getPosition(), context.getResource());
references[i].addMarker(marker);
}
}
-
validateEL(references[i]);
}
}
- return;
}
- /**
- * @param offset - offset of string in file
- * @param length - length of string in file
- */
- private void validateString(IFile file, String string, int offset) {
- int startEl = string.indexOf("#{"); //$NON-NLS-1$
- if(startEl==-1) {
- startEl = string.indexOf("${"); //$NON-NLS-1$
+ private void validateEL(ELReference el) {
+ el.deleteMarkers();
+ for (ELExpression expresion : el.getEl()) {
+ validateELExpression(el, expresion);
}
- if(startEl>-1) {
- ELParser parser = ELParserUtil.getJbossFactory().createParser();
- ELModel model = parser.parse(string);
- List<ELInstance> is = model.getInstances();
-
- ELReference elReference = new KbELReference();
- elReference.setResource(file);
- elReference.setEl(is);
- elReference.setLength(string.length());
- elReference.setStartPosition(offset);
-
- List<SyntaxError> errors = model.getSyntaxErrors();
- if(!errors.isEmpty()) {
- for (SyntaxError error: errors) {
- IMarker marker = addError(JSFValidationMessages.EL_SYNTAX_ERROR, JSFSeverityPreferences.EL_SYNTAX_ERROR, new String[]{"" + error.getProblem()}, 1, offset + error.getPosition(), file);
- elReference.addMarker(marker);
- }
- }
-
- for (ELInstance i : is) {
- if (reporter.isCancelled()) {
- return;
- }
- if(!i.getErrors().isEmpty()) {
- //Already reported syntax problem in this piece of EL.
- continue;
- }
- validateELExpression(elReference, i.getExpression());
- }
- }
}
private void validateELExpression(ELReference elReference, ELExpression el) {
@@ -398,7 +298,6 @@
}
int maxNumberOfResolvedSegments = -1;
List<Var> vars = null;
- Map<Region, List<Var>> varMap = null;
ELContextImpl c = null;
if(!validateVars && context instanceof ELContextImpl) {
c = (ELContextImpl)context;
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IXmlContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IXmlContext.java 2009-12-10 11:10:09 UTC (rev 19181)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/IXmlContext.java 2009-12-10 12:47:46 UTC (rev 19182)
@@ -11,9 +11,7 @@
package org.jboss.tools.jst.web.kb;
-import org.jboss.tools.common.el.core.ELReference;
import org.jboss.tools.common.el.core.resolver.ELContext;
-import org.jboss.tools.common.el.core.resolver.Var;
/**
*
@@ -22,18 +20,4 @@
*/
public interface IXmlContext extends ELContext {
- /**
- * Returns "var" attributes which are available in particular offset.
- *
- * @param offset
- * @return
- */
- Var[] getVars(int offset);
-
- /**
- * Returns all EL references of the file of this context.
- *
- * @return
- */
- ELReference[] getELReferences();
}
\ No newline at end of file
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-12-10 11:10:09 UTC (rev 19181)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-12-10 12:47:46 UTC (rev 19182)
@@ -35,11 +35,17 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner;
+import org.eclipse.jdt.ui.text.IJavaPartitions;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.DocumentEvent;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentListener;
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.Token;
import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController;
import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TLDCMDocumentManager;
import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TaglibTracker;
@@ -77,6 +83,7 @@
import org.jboss.tools.common.el.core.resolver.Var;
import org.jboss.tools.common.resref.core.ResourceReference;
import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jst.web.kb.el.KbELReference;
import org.jboss.tools.jst.web.kb.include.IncludeContextBuilder;
import org.jboss.tools.jst.web.kb.internal.FaceletPageContextImpl;
@@ -105,6 +112,7 @@
public static final String XML_PAGE_CONTEXT_TYPE = "XML_PAGE_CONTEXT_TYPE"; //$NON-NLS-1$
public static final String JSP_PAGE_CONTEXT_TYPE = "JSP_PAGE_CONTEXT_TYPE"; //$NON-NLS-1$
public static final String FACELETS_PAGE_CONTEXT_TYPE = "FACELETS_PAGE_CONTEXT_TYPE"; //$NON-NLS-1$
+ private static final String JAVA_EXT = "java"; //$NON-NLS-1$
public static final PageContextFactory getInstance() {
if (fInstance != null)
@@ -229,9 +237,61 @@
processDelta(delta);
}
}
-
+
+ private ELContext createJavaContext(IFile file) {
+ ELContextImpl context = new ELContextImpl();
+ context.setResource(file);
+ context.setElResolvers(ELResolverFactoryManager.getInstance().getResolvers(file));
+ String content = null;
+ try {
+ content = FileUtil.readStream(file);
+ } catch (CoreException e) {
+ WebKbPlugin.getDefault().logError(e);
+ return null;
+ }
+ FastJavaPartitionScanner scaner = new FastJavaPartitionScanner();
+ Document document = new Document(content);
+ scaner.setRange(document, 0, document.getLength());
+ IToken token = scaner.nextToken();
+ while(token!=null && token!=Token.EOF) {
+ if(IJavaPartitions.JAVA_STRING.equals(token.getData())) {
+ int length = scaner.getTokenLength();
+ int offset = scaner.getTokenOffset();
+ String value = null;
+ try {
+ value = document.get(offset, length);
+ } catch (BadLocationException e) {
+ WebKbPlugin.getDefault().logError(e);
+ return null;
+ }
+ if(value.indexOf('{')>-1) {
+ int startEl = value.indexOf("#{"); //$NON-NLS-1$
+ if(startEl==-1) {
+ startEl = value.indexOf("${"); //$NON-NLS-1$
+ }
+ if(startEl>-1) {
+ ELParser parser = ELParserUtil.getJbossFactory().createParser();
+ ELModel model = parser.parse(value);
+ List<ELInstance> is = model.getInstances();
+
+ ELReference elReference = new KbELReference();
+ elReference.setResource(file);
+ elReference.setEl(is);
+ elReference.setLength(value.length());
+ elReference.setStartPosition(offset);
+ elReference.setSyntaxErrors(model.getSyntaxErrors());
+ context.addELReference(elReference);
+ }
+ }
+ }
+ token = scaner.nextToken();
+ }
+
+ return context;
+ }
+
// long ctm = 0;
-
+
/**
* Creates a page context for the specified context type
*
@@ -242,51 +302,58 @@
*/
private ELContext createPageContext(IFile file, List<String> parents) {
ELContext context = getSavedContext(file);
- if (context != null)
+ if (context != null) {
return context;
-
-// ctm = System.currentTimeMillis();
-// System.out.println("Create Context : " + file.getFullPath().toString() + ", Totals: " + cache.size());
- IModelManager manager = StructuredModelManager.getModelManager();
- if(manager == null) {
- // this may happen if plug-in org.eclipse.wst.sse.core
- // is stopping or un-installed, that is Eclipse is shutting down.
- // there is no need to report it, just stop validation.
- return context;
}
- IStructuredModel model = null;
- try {
- model = manager.getModelForRead(file);
- if (model instanceof IDOMModel) {
- IDOMModel domModel = (IDOMModel) model;
- IDOMDocument document = domModel.getDocument();
-
- context = createPageContextInstance(domModel.getContentTypeIdentifier());
- if (context == null)
- return null;
-
- context.setResource(file);
- context.setElResolvers(ELResolverFactoryManager.getInstance().getResolvers(file));
- if (context instanceof JspContextImpl && !(context instanceof FaceletPageContextImpl)) {
- // Fill JSP namespaces defined in TLDCMDocumentManager
- fillJSPNameSpaces((JspContextImpl)context);
+ String ext = file.getFileExtension();
+ if(ext.equalsIgnoreCase(JAVA_EXT)) {
+ context = createJavaContext(file);
+ } else {
+
+ // ctm = System.currentTimeMillis();
+ // System.out.println("Create Context : " + file.getFullPath().toString() + ", Totals: " + cache.size());
+ IModelManager manager = StructuredModelManager.getModelManager();
+ if(manager == null) {
+ // this may happen if plug-in org.eclipse.wst.sse.core
+ // is stopping or un-installed, that is Eclipse is shutting down.
+ // there is no need to report it, just stop validation.
+ return context;
+ }
+ IStructuredModel model = null;
+ try {
+ model = manager.getModelForRead(file);
+ if (model instanceof IDOMModel) {
+ IDOMModel domModel = (IDOMModel) model;
+ IDOMDocument document = domModel.getDocument();
+
+ context = createPageContextInstance(domModel.getContentTypeIdentifier());
+ if (context == null)
+ return null;
+
+ context.setResource(file);
+ context.setElResolvers(ELResolverFactoryManager.getInstance().getResolvers(file));
+
+ if (context instanceof JspContextImpl && !(context instanceof FaceletPageContextImpl)) {
+ // Fill JSP namespaces defined in TLDCMDocumentManager
+ fillJSPNameSpaces((JspContextImpl)context);
+ }
+
+ // The subsequently called functions may use the file and document
+ // already stored in context for their needs
+ fillContextForChildNodes(document, context, parents);
}
-
- // The subsequently called functions may use the file and document
- // already stored in context for their needs
- fillContextForChildNodes(document, context, parents);
+ } catch (CoreException e) {
+ WebKbPlugin.getDefault().logError(e);
+ } catch (IOException e) {
+ WebKbPlugin.getDefault().logError(e);
+ } finally {
+ if (model != null) {
+ model.releaseFromRead();
+ }
}
- } catch (CoreException e) {
- WebKbPlugin.getDefault().logError(e);
- } catch (IOException e) {
- WebKbPlugin.getDefault().logError(e);
- } finally {
- if (model != null) {
- model.releaseFromRead();
- }
}
-
+
if (context != null) {
if (context instanceof XmlContextImpl) {
IDocument contextDocument = ((XmlContextImpl) context).getDocument();
@@ -299,7 +366,7 @@
return context;
}
-
+
private ELContext createPageContextInstance(String contentType) {
String contextType = IncludeContextBuilder.getContextType(contentType);
if (JSP_PAGE_CONTEXT_TYPE.equals(contextType)) {
@@ -336,7 +403,7 @@
}
}
}
-
+
private void fillContextForChildNodes(IDOMNode parent, ELContext context, List<String> parents) {
NodeList children = parent.getChildNodes();
for(int i = 0; children != null && i < children.getLength(); i++) {
@@ -347,7 +414,7 @@
}
}
}
-
+
private void fillContextForNode(IDOMNode node, ELContext context, List<String> parents) {
if (!(context instanceof FaceletPageContextImpl) && !(node instanceof IDOMElement)) {
// There is no any useful info for JSP in text nodes
@@ -440,7 +507,7 @@
String tagName = node.getLocalName();
Map<String, List<INameSpace>> nsMap = context.getNameSpaces(node.getStartOffset());
String[] uris = getUrisByPrefix(nsMap, prefix);
-
+
if (uris != null) {
for (String uri : uris) {
if (context instanceof IIncludedContextSupport) {
@@ -448,7 +515,7 @@
if (includeAttributes != null) {
List<String> newParentList = parents == null ? new ArrayList<String>() : new ArrayList<String>(parents);
newParentList.add(context.getResource().getFullPath().toString());
-
+
for (String attr : includeAttributes) {
String fileName = node.getAttribute(attr);
if (fileName == null || fileName.trim().length() == 0)
@@ -457,7 +524,7 @@
IFile file = getFileFromProject(fileName, context.getResource());
if (file == null)
continue;
-
+
// Fix for JBIDE-5083 >>>
if (!checkCycling(parents, file))
continue;
@@ -484,7 +551,7 @@
}
}
}
-
+
private boolean checkCycling(List<String> parents, IFile resource) {
String resourceId = resource.getFullPath().toString();
if (parents != null) {
@@ -495,7 +562,7 @@
}
return true;
}
-
+
/**
* Sets up the context with namespaces and according libraries for the node
* For the Facelet Context the methods adds an additional special namespace for
@@ -517,12 +584,12 @@
String prefix = name.startsWith("xmlns:") ? name.substring("xmlns:".length()) : ""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
String uri = a.getValue();
-
+
prefix = prefix == null ? null : prefix.trim();
uri = uri == null ? null : uri.trim();
if (XHTML_TAG_LIB_URI.equalsIgnoreCase(uri))
continue;
-
+
if (prefix != null // prefix may be empty
&& uri != null && uri.length() > 0) {
@@ -547,7 +614,7 @@
context.addNameSpace(region, nameSpace);
if (prefix.length() == 0)
mainNnIsRedefined = true;
-
+
if (context instanceof FaceletPageContextImpl &&
CustomTagLibManager.FACELETS_UI_TAG_LIB_URI.equals(uri) &&
!mainNnIsRedefined) {
@@ -561,7 +628,7 @@
}
}
}
-
+
private void fillResourceBundlesForNode(IDOMElement node, JspContextImpl context) {
String name = node.getNodeName();
if (name == null) return;
@@ -582,7 +649,7 @@
context.addResourceBundle(new ResourceBundle(basename, var));
}
-
+
private void fillCSSStyleSheetFromAttribute(IDOMElement node,
String attribute, ICSSContainerSupport context) {
CSSStyleSheetDescriptor descr = getSheetForTagAttribute(node, attribute);
@@ -600,13 +667,13 @@
public static class CSSStyleSheetDescriptor {
public CSSStyleSheet sheet;
public String source;
-
+
CSSStyleSheetDescriptor (String source, CSSStyleSheet sheet) {
this.source = source;
this.sheet = sheet;
}
}
-
+
/**
*
* @param stylesContainer
@@ -620,12 +687,10 @@
.getAdapterFor(IStyleSheetAdapter.class);
if (!(adapter instanceof ExtendedLinkElementAdapter)) {
-
notifier.removeAdapter(adapter);
adapter = new ExtendedLinkElementAdapter(
(Element) stylesContainer, attribute);
notifier.addAdapter(adapter);
-
}
CSSStyleSheet sheet = null;
@@ -638,7 +703,7 @@
return sheet == null || source == null ? null : new CSSStyleSheetDescriptor(source, sheet);
}
-
+
/**
*
* @param stylesContainer
@@ -669,7 +734,6 @@
return false;
}
-
/**
* Searches the namespace map and returns all the URIs for the specified prefix
*
@@ -688,7 +752,7 @@
}
}
}
-
+
return uris.isEmpty() ? new String[] {prefix} : (String[])uris.toArray(new String[uris.size()]);
}
@@ -701,7 +765,7 @@
*/
public static IFile getFileFromProject(String fileName, IFile documentFile) {
if(documentFile == null || !documentFile.isAccessible()) return null;
-
+
fileName = findAndReplaceElVariable(fileName);
IProject project = documentFile.getProject();
@@ -734,15 +798,15 @@
}
return null;
}
-
+
private static IFile findFileByRelativePath(IProject project,
WorkbenchComponent module, IPath basePath, String path) {
-
+
if (path == null || path.trim().length() == 0)
return null;
-
+
path = findAndReplaceElVariable(path);
-
+
ComponentResource[] resources = module.findResourcesBySourcePath(
new Path("/"), 0); //$NON-NLS-1$
IPath projectPath = project.getLocation();
@@ -780,7 +844,7 @@
WorkbenchComponent module, String path) {
ComponentResource[] resources = module.findResourcesBySourcePath(
new Path("/"), 0); //$NON-NLS-1$
-
+
path = findAndReplaceElVariable(path);
IFile member = null;
@@ -805,13 +869,13 @@
}
return null;
}
-
+
private static final String DOLLAR_PREFIX = "${"; //$NON-NLS-1$
private static final String SUFFIX = "}"; //$NON-NLS-1$
private static final String SHARP_PREFIX = "#{"; //$NON-NLS-1$
-
+
public static final String CONTEXT_PATH_EXPRESSION = "^\\s*(\\#|\\$)\\{facesContext.externalContext.requestContextPath\\}"; //$NON-NLS-1$
// partly copied from org.jboss.tools.vpe.editor.util.ElService
@@ -839,7 +903,7 @@
}
return result;
}
-
+
// copied from org.jboss.tools.vpe.editor.util.ElService
private static ResourceReference[] sortReferencesByScope(ResourceReference[] references) {
ResourceReference[] sortedReferences = references.clone();
@@ -852,7 +916,7 @@
return sortedReferences;
}
-
+
public static class ExtendedLinkElementAdapter extends LinkElementAdapter {
private Element element;
@@ -872,12 +936,12 @@
public String getSource() {
return source;
}
-
+
@Override
protected boolean isValidAttribute() {
if (super.isValidAttribute())
return true;
-
+
String href = getElement().getAttribute(hrefAttrName);
if (href == null || href.length() == 0)
return false;
@@ -904,7 +968,7 @@
private String getSourceFromAttribute(String hrefAttributeName) {
String hrefExtracted = findAndReplaceElVariable(element
.getAttribute(hrefAttrName));
-
+
return hrefExtracted;
}
@@ -972,12 +1036,12 @@
}
return true;
}
-
+
private void processDelta(IResourceDelta delta) {
if(delta == null) return;
int kind = delta.getKind();
IResource resource = delta.getResource();
-
+
if(resource instanceof IProject &&
kind == IResourceDelta.REMOVED) {
cleanUp((IProject)resource);
@@ -995,12 +1059,12 @@
}
return;
}
-
+
private boolean isDependencyContext(ELContext context, IFile resource) {
if (resource.equals(context.getResource())) {
return true;
}
-
+
if(context instanceof IIncludedContextSupport) {
List<ELContext> includedContexts = ((IIncludedContextSupport)context).getIncludedContexts();
if (includedContexts != null) {
@@ -1012,7 +1076,7 @@
}
return false;
}
-
+
@Override
protected void finalize() throws Throwable {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19181 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-12-10 06:10:09 -0500 (Thu, 10 Dec 2009)
New Revision: 19181
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InterceptorBindingDeclaration.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InterceptorBindingElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/StereotypeDeclaration.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/StereotypeElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationHelper.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4943
Header comments added
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import java.util.HashSet;
@@ -10,6 +20,11 @@
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class AbstractBeanElement extends CDIElement {
protected AbstractMemberDefinition definition;
protected AnnotationDeclaration named;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AnnotationDeclaration.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import org.eclipse.jdt.core.IAnnotation;
@@ -10,6 +20,11 @@
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class AnnotationDeclaration implements IAnnotationDeclaration {
protected CDICoreNature project;
protected IAnnotation annotation;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanField.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import org.eclipse.jdt.core.IField;
@@ -5,6 +15,11 @@
import org.jboss.tools.cdi.core.IBeanField;
import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class BeanField extends BeanMember implements IBeanField {
protected IField field;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import org.eclipse.jdt.core.IMember;
@@ -10,6 +20,11 @@
import org.jboss.tools.cdi.core.ITypeDeclaration;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public abstract class BeanMember extends AbstractBeanElement implements IBeanMember {
protected IClassBean classBean;
protected ITypeDeclaration typeDeclaration;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMethod.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import java.util.ArrayList;
@@ -9,6 +19,11 @@
import org.jboss.tools.cdi.core.IParameter;
import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class BeanMethod extends BeanMember implements IBeanMethod {
protected IMethod method;
protected AnnotationDeclaration inject;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import org.eclipse.core.resources.IResource;
@@ -4,8 +14,12 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.jboss.tools.cdi.core.ICDIElement;
-import org.jboss.tools.cdi.core.ICDIProject;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class CDIElement implements ICDIElement {
protected CDIElement parent;
protected IPath source;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import java.util.HashMap;
@@ -25,6 +35,11 @@
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
import org.jboss.tools.common.text.INodeReference;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class CDIProject extends CDIElement implements ICDIProject {
CDICoreNature n;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import java.util.ArrayList;
@@ -29,6 +39,11 @@
import org.jboss.tools.common.model.project.ext.impl.ValueInfo;
import org.jboss.tools.common.text.ITextSourceReference;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class ClassBean extends AbstractBeanElement implements IClassBean {
protected List<BeanField> fields = new ArrayList<BeanField>();
protected List<BeanMethod> methods = new ArrayList<BeanMethod>();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,12 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import java.util.Set;
-import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IDecorator;
import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class DecoratorBean extends ClassBean implements IDecorator {
public DecoratorBean() {}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import org.eclipse.jdt.core.IType;
@@ -4,6 +14,11 @@
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IInjectionPointField;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class InjectionPointField extends BeanField implements IInjectionPointField {
public InjectionPointField() {}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InterceptorBindingDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InterceptorBindingDeclaration.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InterceptorBindingDeclaration.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import org.jboss.tools.cdi.core.IInterceptorBinding;
@@ -3,4 +13,9 @@
import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class InterceptorBindingDeclaration extends AnnotationDeclaration
implements IInterceptorBindingDeclaration {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InterceptorBindingElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InterceptorBindingElement.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InterceptorBindingElement.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import java.util.HashSet;
@@ -9,6 +19,11 @@
import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class InterceptorBindingElement extends CDIElement implements IInterceptorBinding {
AnnotationDefinition definition;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import org.eclipse.jdt.core.IType;
@@ -3,4 +13,9 @@
import org.jboss.tools.cdi.core.IParametedType;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class ParametedType implements IParametedType {
protected IType type;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import java.util.HashSet;
@@ -24,6 +34,11 @@
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.text.ITextSourceReference;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class ProducerField extends BeanField implements IProducerField {
public ProducerField() {}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import java.util.HashSet;
@@ -24,6 +34,11 @@
import org.jboss.tools.common.model.util.EclipseJavaUtil;
import org.jboss.tools.common.text.ITextSourceReference;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class ProducerMethod extends BeanMethod implements IProducerMethod {
protected AnnotationDeclaration produces;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/StereotypeDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/StereotypeDeclaration.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/StereotypeDeclaration.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import org.jboss.tools.cdi.core.IStereotype;
@@ -3,4 +13,9 @@
import org.jboss.tools.cdi.core.IStereotypeDeclaration;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class StereotypeDeclaration extends AnnotationDeclaration implements IStereotypeDeclaration {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/StereotypeElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/StereotypeElement.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/StereotypeElement.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import java.util.HashSet;
@@ -13,6 +23,11 @@
import org.jboss.tools.cdi.core.IStereotypeDeclaration;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class StereotypeElement extends CDIElement implements IStereotype {
AnnotationDefinition definition;
protected AnnotationDeclaration named;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl;
import org.eclipse.jdt.core.IType;
@@ -3,4 +13,9 @@
import org.jboss.tools.cdi.core.ITypeDeclaration;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class TypeDeclaration extends ParametedType implements ITypeDeclaration {
int length;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractMemberDefinition.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl.definition;
import java.util.ArrayList;
@@ -13,6 +23,11 @@
import org.jboss.tools.cdi.internal.core.impl.InterceptorBindingDeclaration;
import org.jboss.tools.cdi.internal.core.impl.StereotypeDeclaration;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public abstract class AbstractMemberDefinition {
protected List<AnnotationDeclaration> annotations = new ArrayList<AnnotationDeclaration>();
protected IAnnotatable member;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl.definition;
import java.util.HashSet;
@@ -8,6 +18,11 @@
import org.jboss.tools.cdi.core.IParametedType;
import org.jboss.tools.common.model.util.EclipseJavaUtil;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class AbstractTypeDefinition extends AbstractMemberDefinition {
protected String qualifiedName;
protected IType type;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationDefinition.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl.definition;
import java.util.HashMap;
@@ -8,6 +18,11 @@
import org.jboss.tools.cdi.core.CDIConstants;
import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class AnnotationDefinition extends AbstractTypeDefinition {
public static final int NON_RELEVANT = 0;
public static final int BASIC = 1; //has Inherited, Target, Retention
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationHelper.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationHelper.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AnnotationHelper.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl.definition;
import java.util.HashSet;
@@ -5,6 +15,11 @@
import org.jboss.tools.cdi.core.CDIConstants;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class AnnotationHelper implements CDIConstants {
public static final Set<String> BASIC_ANNOTATION_TYPES = new HashSet<String>();
public static final Set<String> CDI_ANNOTATION_TYPES = new HashSet<String>();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl.definition;
import java.util.ArrayList;
@@ -13,6 +23,11 @@
import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class DefinitionContext {
protected CDICoreNature project;
protected IJavaProject javaProject;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl.definition;
import org.eclipse.jdt.core.IField;
@@ -2,2 +12,7 @@
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class FieldDefinition extends AbstractMemberDefinition {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl.definition;
import org.eclipse.core.runtime.CoreException;
@@ -3,7 +13,10 @@
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
-import org.jboss.tools.cdi.core.CDIConstants;
-import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class MethodDefinition extends AbstractMemberDefinition {
IMethod method;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2009-12-10 10:50:45 UTC (rev 19180)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2009-12-10 11:10:09 UTC (rev 19181)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.cdi.internal.core.impl.definition;
import java.util.ArrayList;
@@ -9,6 +19,11 @@
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration;
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
public class TypeDefinition extends AbstractTypeDefinition {
List<FieldDefinition> fields = new ArrayList<FieldDefinition>();
List<MethodDefinition> methods = new ArrayList<MethodDefinition>();
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19180 - trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-12-10 05:50:45 -0500 (Thu, 10 Dec 2009)
New Revision: 19180
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleLabelProvider.java
Log:
JBIDE-5363: Change the BPEL version number to be format: yyyymmddHHMMSS
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleLabelProvider.java
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleLabelProvider.java 2009-12-10 09:03:54 UTC (rev 19179)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/ui/view/server/BPELModuleLabelProvider.java 2009-12-10 10:50:45 UTC (rev 19180)
@@ -3,12 +3,14 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.bpel.runtimes.IRuntimesUIConstants;
+import org.jboss.tools.bpel.runtimes.RuntimesPlugin;
import org.jboss.tools.bpel.runtimes.ui.view.server.BPELModuleContentProvider.BPELVersionDeployment;
public class BPELModuleLabelProvider extends LabelProvider {
public Image getImage(Object element) {
- // TODO Add an icon
- return null;
+
+ return RuntimesPlugin.getPlugin().getImage(IRuntimesUIConstants.ICON_BPEL_FACET);
}
public String getText(Object element) {
15 years, 1 month
- 1
- 0
JBoss Tools SVN: r19178 - trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2009-12-10 01:50:56 -0500 (Thu, 10 Dec 2009)
New Revision: 19178
Modified:
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditor.java
Log:
JBIDE-5397:BPEL Plugin - Apache ODE Deployment Descriptor Save appears to not save
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditor.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditor.java 2009-12-10 03:13:29 UTC (rev 19177)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/editors/ODEDeployMultiPageEditor.java 2009-12-10 06:50:56 UTC (rev 19178)
@@ -40,6 +40,7 @@
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
import org.eclipse.emf.edit.ui.util.EditUIUtil;
import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.PartInitException;
@@ -74,6 +75,7 @@
commitPages(true);
saveDeploymentDescriptor();
((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+ firePropertyChange(IEditorPart.PROP_DIRTY);
}
/**
15 years, 1 month
- 1
- 0