JBoss Tools SVN: r38245 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-01-27 12:30:19 -0500 (Fri, 27 Jan 2012)
New Revision: 38245
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java
Log:
Constructions like "flag & Flags.AccPublic == 0" changed to Flags.isPublic(flag)
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java 2012-01-27 15:52:45 UTC (rev 38244)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddLocalBeanMarkerResolution.java 2012-01-27 17:30:19 UTC (rev 38245)
@@ -73,17 +73,16 @@
// make method public
int position = method.getSourceRange().getOffset();
- if((flag & Flags.AccPublic) == 0){
- if((flag & Flags.AccPrivate) != 0){
+ if(!Flags.isPublic(flag)){
+ if(Flags.isPrivate(flag)){
position += text.indexOf(PRIVATE);
edit.addChild(new ReplaceEdit(position, PRIVATE.length(), PUBLIC));
- }else if((flag & Flags.AccProtected) != 0){
+ }else if(Flags.isProtected(flag)){
position += text.indexOf(PROTECTED);
edit.addChild(new ReplaceEdit(position, PROTECTED.length(), PUBLIC));
}else{
String type = Signature.getSignatureSimpleName(method.getReturnType());
position += text.indexOf(type);
- buffer.replace(position, 0, PUBLIC+SPACE);
edit.addChild(new InsertEdit(position, PUBLIC+SPACE));
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2012-01-27 15:52:45 UTC (rev 38244)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldProtectedMarkerResolution.java 2012-01-27 17:30:19 UTC (rev 38245)
@@ -111,7 +111,7 @@
String text = buffer.getText(field.getSourceRange().getOffset(), field.getSourceRange().getLength());
int position = field.getSourceRange().getOffset();
- if((flag & Flags.AccPublic) != 0){
+ if(Flags.isPublic(flag)){
position += text.indexOf(PUBLIC);
TextEdit re = new ReplaceEdit(position, PUBLIC.length(), PROTECTED);
edit.addChild(re);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java 2012-01-27 15:52:45 UTC (rev 38244)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeFieldStaticMarkerResolution.java 2012-01-27 17:30:19 UTC (rev 38245)
@@ -64,15 +64,15 @@
String text = buffer.getText(field.getSourceRange().getOffset(), field.getSourceRange().getLength());
int position = field.getSourceRange().getOffset();
- if((flag & Flags.AccPublic) != 0){
+ if(Flags.isPublic(flag)){
position += text.indexOf(CDIMarkerResolutionUtils.PUBLIC)+CDIMarkerResolutionUtils.PUBLIC.length();
InsertEdit ie = new InsertEdit(position, CDIMarkerResolutionUtils.SPACE+CDIMarkerResolutionUtils.STATIC);
edit.addChild(ie);
- }else if((flag & Flags.AccPrivate) != 0){
+ }else if(Flags.isPrivate(flag)){
position += text.indexOf(CDIMarkerResolutionUtils.PRIVATE)+CDIMarkerResolutionUtils.PRIVATE.length();
InsertEdit ie = new InsertEdit(position, CDIMarkerResolutionUtils.SPACE+CDIMarkerResolutionUtils.STATIC);
edit.addChild(ie);
- }else if((flag & Flags.AccProtected) != 0){
+ }else if(Flags.isProtected(flag)){
position += text.indexOf(CDIMarkerResolutionUtils.PROTECTED)+CDIMarkerResolutionUtils.PROTECTED.length();
InsertEdit ie = new InsertEdit(position, CDIMarkerResolutionUtils.SPACE+CDIMarkerResolutionUtils.STATIC);
edit.addChild(ie);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2012-01-27 15:52:45 UTC (rev 38244)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2012-01-27 17:30:19 UTC (rev 38245)
@@ -76,20 +76,19 @@
// make method public
int position = method.getSourceRange().getOffset();
- if((flag & Flags.AccPublic) != 0){
- // do nothing
- }else if((flag & Flags.AccPrivate) != 0){
- position += text.indexOf(PRIVATE);
- buffer.replace(position, PRIVATE.length(), PUBLIC);
- }else if((flag & Flags.AccProtected) != 0){
- position += text.indexOf(PROTECTED);
- buffer.replace(position, PROTECTED.length(), PUBLIC);
- }else{
- String type = Signature.getSignatureSimpleName(method.getReturnType());
- position += text.indexOf(type);
- buffer.replace(position, 0, PUBLIC+SPACE);
+ if(!Flags.isPublic(flag)){
+ if(Flags.isPrivate(flag)){
+ position += text.indexOf(PRIVATE);
+ buffer.replace(position, PRIVATE.length(), PUBLIC);
+ }else if(Flags.isProtected(flag)){
+ position += text.indexOf(PROTECTED);
+ buffer.replace(position, PROTECTED.length(), PUBLIC);
+ }else{
+ String type = Signature.getSignatureSimpleName(method.getReturnType());
+ position += text.indexOf(type);
+ buffer.replace(position, 0, PUBLIC+SPACE);
+ }
}
-
compilationUnit.commitWorkingCopy(false, new NullProgressMonitor());
compilationUnit.discardWorkingCopy();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java 2012-01-27 15:52:45 UTC (rev 38244)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodPublicMarkerResolution.java 2012-01-27 17:30:19 UTC (rev 38245)
@@ -69,12 +69,12 @@
// make method public
int position = workingCopyMethod.getSourceRange().getOffset();
- if((flag & Flags.AccPublic) == 0){
- if((flag & Flags.AccPrivate) != 0){
+ if(!Flags.isPublic(flag)){
+ if(Flags.isPrivate(flag)){
position += text.indexOf(CDIMarkerResolutionUtils.PRIVATE);
ReplaceEdit re = new ReplaceEdit(position, CDIMarkerResolutionUtils.PRIVATE.length(), CDIMarkerResolutionUtils.PUBLIC);
edit.addChild(re);
- }else if((flag & Flags.AccProtected) != 0){
+ }else if(Flags.isProtected(flag)){
position += text.indexOf(CDIMarkerResolutionUtils.PROTECTED);
ReplaceEdit re = new ReplaceEdit(position, CDIMarkerResolutionUtils.PROTECTED.length(), CDIMarkerResolutionUtils.PUBLIC);
edit.addChild(re);
12 years, 5 months
JBoss Tools SVN: r38244 - in workspace/bfitzpat/org.jboss.tools.esb.visualizer: src/org/jboss/tools/esb/visualizer/views and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2012-01-27 10:52:45 -0500 (Fri, 27 Jan 2012)
New Revision: 38244
Added:
workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBNode.java
workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBNodeWithChildren.java
Removed:
workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/TreeObject.java
workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/TreeParent.java
Modified:
workspace/bfitzpat/org.jboss.tools.esb.visualizer/plugin.xml
workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBDomParser.java
workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBVisualizerView.java
Log:
[JBIDE-10726] A bit of refactoring, adding Show In support to JBoss perspective
Modified: workspace/bfitzpat/org.jboss.tools.esb.visualizer/plugin.xml
===================================================================
--- workspace/bfitzpat/org.jboss.tools.esb.visualizer/plugin.xml 2012-01-27 11:34:16 UTC (rev 38243)
+++ workspace/bfitzpat/org.jboss.tools.esb.visualizer/plugin.xml 2012-01-27 15:52:45 UTC (rev 38244)
@@ -29,5 +29,11 @@
id="org.jboss.tools.esb.visualizer.views.ESBVisualizerView">
</showInPart>
</perspectiveExtension>
+ <perspectiveExtension
+ targetID="org.jboss.tools.common.ui.JBossPerspective">
+ <showInPart
+ id="org.jboss.tools.esb.visualizer.views.ESBVisualizerView">
+ </showInPart>
+ </perspectiveExtension>
</extension>
</plugin>
Modified: workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBDomParser.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBDomParser.java 2012-01-27 11:34:16 UTC (rev 38243)
+++ workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBDomParser.java 2012-01-27 15:52:45 UTC (rev 38244)
@@ -24,7 +24,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
import org.jboss.tools.esb.visualizer.Activator;
-import org.jboss.tools.esb.visualizer.views.TreeObject.ESBType;
+import org.jboss.tools.esb.visualizer.views.ESBNode.ESBType;
import org.osgi.framework.Bundle;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -34,7 +34,7 @@
public class ESBDomParser {
Document dom;
- TreeParent root;
+ ESBNodeWithChildren root;
public boolean isFileESBConfig ( String filepath ) {
//get the factory
@@ -66,7 +66,7 @@
public void parseXmlFile(String filepath){
- root = new TreeParent("Invisible Root");
+ root = new ESBNodeWithChildren("Invisible Root");
//get the factory
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -120,8 +120,8 @@
}
}
if(providersElement != null) {
- TreeParent providersRoot = new TreeParent("Providers");
- providersRoot.setEsbObjectType(TreeObject.ESBType.PROVIDER);
+ ESBNodeWithChildren providersRoot = new ESBNodeWithChildren("Providers");
+ providersRoot.setEsbObjectType(ESBNode.ESBType.PROVIDER);
processChildren(providersRoot, providersElement);
root.addChild(providersRoot);
}
@@ -138,15 +138,15 @@
}
}
if(servicesElement != null) {
- TreeParent servicesRoot = new TreeParent("Services");
- servicesRoot.setEsbObjectType(TreeObject.ESBType.SERVICE);
+ ESBNodeWithChildren servicesRoot = new ESBNodeWithChildren("Services");
+ servicesRoot.setEsbObjectType(ESBNode.ESBType.SERVICE);
processChildren(servicesRoot, servicesElement);
root.addChild(servicesRoot);
}
}
}
- private void processChildren ( TreeParent parent, Element el ) {
+ private void processChildren ( ESBNodeWithChildren parent, Element el ) {
el.normalize();
parent.setData(el);
@@ -186,7 +186,7 @@
name = child.getTagName();
}
- TreeParent childNode = new TreeParent(name);
+ ESBNodeWithChildren childNode = new ESBNodeWithChildren(name);
String ref = child.getAttribute("busidref");
if (ref != null && ref.trim().length() > 0) {
childNode.setRef(ref);
@@ -200,7 +200,7 @@
}
}
- public TreeParent getRoot() {
+ public ESBNodeWithChildren getRoot() {
return this.root;
}
Copied: workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBNode.java (from rev 38219, workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/TreeObject.java)
===================================================================
--- workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBNode.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBNode.java 2012-01-27 15:52:45 UTC (rev 38244)
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.esb.visualizer.views;
+
+import org.eclipse.core.runtime.IAdaptable;
+
+public class ESBNode implements IAdaptable {
+ private String name;
+ private ESBNodeWithChildren parent;
+ private String ref;
+ private boolean wasMovedFlag = false;
+ private ESBType esbObjectType;
+ private Object data;
+
+ public enum ESBType {
+ ACTION, BUS, LISTENER, PROVIDER,
+ ESB, PROPERTY, SERVICE
+ }
+
+ public ESBNode(String name) {
+ this.name = name;
+ }
+ public String getName() {
+ return name;
+ }
+ public void setName(String newName) {
+ this.name = newName;
+ }
+ public void setParent(ESBNodeWithChildren parent) {
+ this.parent = parent;
+ }
+ public ESBNodeWithChildren getParent() {
+ return parent;
+ }
+ public String toString() {
+ return getName();
+ }
+ @SuppressWarnings("rawtypes")
+ public Object getAdapter(Class key) {
+ return null;
+ }
+ public String getRef() {
+ return ref;
+ }
+ public void setRef(String ref) {
+ this.ref = ref;
+ }
+ protected boolean wasMoved() {
+ return wasMovedFlag;
+ }
+ protected void setWasMoved(boolean wasMoved) {
+ this.wasMovedFlag = wasMoved;
+ }
+ protected ESBType getEsbObjectType() {
+ return esbObjectType;
+ }
+ protected void setEsbObjectType(ESBType esbObjectType) {
+ this.esbObjectType = esbObjectType;
+ }
+ protected Object getData() {
+ return data;
+ }
+ protected void setData(Object data) {
+ this.data = data;
+ }
+}
\ No newline at end of file
Property changes on: workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBNode.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBNodeWithChildren.java (from rev 38219, workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/TreeParent.java)
===================================================================
--- workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBNodeWithChildren.java (rev 0)
+++ workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBNodeWithChildren.java 2012-01-27 15:52:45 UTC (rev 38244)
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.esb.visualizer.views;
+
+import java.util.ArrayList;
+
+public class ESBNodeWithChildren extends ESBNode {
+
+ private ArrayList<ESBNode> children;
+ public ESBNodeWithChildren(String name) {
+ super(name);
+ children = new ArrayList<ESBNode>();
+ }
+ public void addChild(ESBNode child) {
+ children.add(child);
+ child.setParent(this);
+ }
+ public void removeChild(ESBNode child) {
+ children.remove(child);
+ child.setParent(null);
+ }
+ public ESBNode [] getChildren() {
+ return (ESBNode [])children.toArray(new ESBNode[children.size()]);
+ }
+ public boolean hasChildren() {
+ return children.size()>0;
+ }
+}
Property changes on: workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBNodeWithChildren.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBVisualizerView.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBVisualizerView.java 2012-01-27 11:34:16 UTC (rev 38243)
+++ workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/ESBVisualizerView.java 2012-01-27 15:52:45 UTC (rev 38244)
@@ -57,7 +57,7 @@
import org.eclipse.zest.layouts.constraints.BasicEntityConstraint;
import org.eclipse.zest.layouts.constraints.LayoutConstraint;
import org.jboss.tools.esb.visualizer.Activator;
-import org.jboss.tools.esb.visualizer.views.TreeObject.ESBType;
+import org.jboss.tools.esb.visualizer.views.ESBNode.ESBType;
/**
* This class serves as a simple read-only way to visualize an ESB configuration
@@ -178,7 +178,7 @@
ESBDomParser parser = new ESBDomParser();
parser.parseXmlFile(filepath);
clearGraph();
- TreeParent root = parser.getRoot();
+ ESBNodeWithChildren root = parser.getRoot();
root.setEsbObjectType(ESBType.ESB);
GraphNode rootnode = new GraphNode(gv.getGraphControl(),
ZestStyles.NODES_CACHE_LABEL,
@@ -218,10 +218,10 @@
* @param root
* @param parent
*/
- private void drawNodes ( GraphNode root, TreeParent parent ) {
+ private void drawNodes ( GraphNode root, ESBNodeWithChildren parent ) {
if (parent.hasChildren()) {
for (int i = 0; i < parent.getChildren().length; i++) {
- TreeParent tp = (TreeParent) parent.getChildren()[i];
+ ESBNodeWithChildren tp = (ESBNodeWithChildren) parent.getChildren()[i];
GraphNode p = new GraphNode(gv.getGraphControl(), SWT.NONE, tp.getName());
if (tp.getEsbObjectType() != null) {
switch (tp.getEsbObjectType()) {
@@ -267,8 +267,8 @@
Iterator<GraphNode> nodeIter = gv.getGraphControl().getGraphModel().getNodes().iterator();
while (nodeIter.hasNext()) {
GraphNode node = nodeIter.next();
- if (node.getData() != null && node.getData() instanceof TreeParent) {
- TreeParent tp = (TreeParent) node.getData();
+ if (node.getData() != null && node.getData() instanceof ESBNodeWithChildren) {
+ ESBNodeWithChildren tp = (ESBNodeWithChildren) node.getData();
if (tp.getRef() != null && tp.getRef().trim().length() > 0) {
GraphNode refNode = findNode(tp.getRef(), root);
if (refNode != null) {
@@ -499,8 +499,8 @@
GraphNode graphnode = (GraphNode) object;
Object data = graphnode.getData();
- if (data != null && data instanceof TreeObject) {
- boolean wasMoved = ((TreeObject)data).wasMoved();
+ if (data != null && data instanceof ESBNode) {
+ boolean wasMoved = ((ESBNode)data).wasMoved();
basicEntityConstraint.hasPreferredLocation = wasMoved;
}
}
@@ -519,8 +519,8 @@
Graph graph = ((GraphViewer) e.getSource()).getGraphControl();
if (!graph.getSelection().isEmpty()) {
GraphNode node = (GraphNode) graph.getSelection().get(0);
- if (node.getData() != null && node.getData() instanceof TreeObject) {
- TreeObject to = (TreeObject)node.getData();
+ if (node.getData() != null && node.getData() instanceof ESBNode) {
+ ESBNode to = (ESBNode)node.getData();
to.setWasMoved(!to.wasMoved());
if (to.wasMoved()) {
node.setBorderWidth(3);
@@ -580,8 +580,13 @@
Object first = ss.getFirstElement();
if (first instanceof IFile) {
String path = ((IFile)first).getLocation().toOSString();
- visualizeESB(path);
- return true;
+ ESBDomParser parser = new ESBDomParser();
+ if (parser.isFileESBConfig(path)) {
+ visualizeESB(path);
+ return true;
+ } else {
+ return false;
+ }
}
}
return false;
Deleted: workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/TreeObject.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/TreeObject.java 2012-01-27 11:34:16 UTC (rev 38243)
+++ workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/TreeObject.java 2012-01-27 15:52:45 UTC (rev 38244)
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.esb.visualizer.views;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-public class TreeObject implements IAdaptable {
- private String name;
- private TreeParent parent;
- private String ref;
- private boolean wasMovedFlag = false;
- private ESBType esbObjectType;
- private Object data;
-
- public enum ESBType {
- ACTION, BUS, LISTENER, PROVIDER,
- ESB, PROPERTY, SERVICE
- }
-
- public TreeObject(String name) {
- this.name = name;
- }
- public String getName() {
- return name;
- }
- public void setName(String newName) {
- this.name = newName;
- }
- public void setParent(TreeParent parent) {
- this.parent = parent;
- }
- public TreeParent getParent() {
- return parent;
- }
- public String toString() {
- return getName();
- }
- @SuppressWarnings("rawtypes")
- public Object getAdapter(Class key) {
- return null;
- }
- public String getRef() {
- return ref;
- }
- public void setRef(String ref) {
- this.ref = ref;
- }
- protected boolean wasMoved() {
- return wasMovedFlag;
- }
- protected void setWasMoved(boolean wasMoved) {
- this.wasMovedFlag = wasMoved;
- }
- protected ESBType getEsbObjectType() {
- return esbObjectType;
- }
- protected void setEsbObjectType(ESBType esbObjectType) {
- this.esbObjectType = esbObjectType;
- }
- protected Object getData() {
- return data;
- }
- protected void setData(Object data) {
- this.data = data;
- }
-}
\ No newline at end of file
Deleted: workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/TreeParent.java
===================================================================
--- workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/TreeParent.java 2012-01-27 11:34:16 UTC (rev 38243)
+++ workspace/bfitzpat/org.jboss.tools.esb.visualizer/src/org/jboss/tools/esb/visualizer/views/TreeParent.java 2012-01-27 15:52:45 UTC (rev 38244)
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.esb.visualizer.views;
-
-import java.util.ArrayList;
-
-public class TreeParent extends TreeObject {
-
- private ArrayList<TreeObject> children;
- public TreeParent(String name) {
- super(name);
- children = new ArrayList<TreeObject>();
- }
- public void addChild(TreeObject child) {
- children.add(child);
- child.setParent(this);
- }
- public void removeChild(TreeObject child) {
- children.remove(child);
- child.setParent(null);
- }
- public TreeObject [] getChildren() {
- return (TreeObject [])children.toArray(new TreeObject[children.size()]);
- }
- public boolean hasChildren() {
- return children.size()>0;
- }
-}
12 years, 5 months
JBoss Tools SVN: r38243 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-01-27 06:34:16 -0500 (Fri, 27 Jan 2012)
New Revision: 38243
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
Log:
[JBIDE-10735] shortened the labels for both new OpenShift wizards
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-01-27 10:57:32 UTC (rev 38242)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-01-27 11:34:16 UTC (rev 38243)
@@ -17,7 +17,7 @@
class="org.jboss.tools.openshift.express.internal.ui.wizard.CreateNewApplicationWizard"
icon="icons/openshift-logo-white-icon.png"
id="org.jboss.ide.eclipse.as.openshift.express.ui.wizard.createNewApplicationWizard"
- name="Create a new OpenShift Express Application">
+ name="OpenShift Express Application">
</wizard>
</extension>
<extension
@@ -31,7 +31,7 @@
class="org.jboss.tools.openshift.express.internal.ui.wizard.ImportExistingApplicationWizard"
icon="icons/openshift-logo-white-icon.png"
id="org.jboss.tools.openshift.express.ui.importExistingApplicationWizard"
- name="Import an existing OpenShift Express Application">
+ name="Existing OpenShift Express Application">
</wizard>
</extension>
<extension
12 years, 5 months
JBoss Tools SVN: r38242 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-01-27 05:57:32 -0500 (Fri, 27 Jan 2012)
New Revision: 38242
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ViewBase.java
Log:
Changing modifier of Logger attributes to protected - to be used in subclasses as well
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ViewBase.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ViewBase.java 2012-01-27 10:53:47 UTC (rev 38241)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ViewBase.java 2012-01-27 10:57:32 UTC (rev 38242)
@@ -3,7 +3,6 @@
import org.apache.log4j.Logger;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.SWTBotTestCase;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
import org.jboss.tools.ui.bot.ext.SWTOpenExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
@@ -24,7 +23,7 @@
protected final SWTUtilExt util;
protected final SWTBotExt bot;
- Logger log = Logger.getLogger(ViewBase.class);
+ protected Logger log = Logger.getLogger(ViewBase.class);
public ViewBase() {
open = SWTTestExt.open;
12 years, 5 months
JBoss Tools SVN: r38241 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-01-27 05:53:47 -0500 (Fri, 27 Jan 2012)
New Revision: 38241
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java
Log:
Annotation Properties view added
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2012-01-27 10:18:06 UTC (rev 38240)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2012-01-27 10:53:47 UTC (rev 38241)
@@ -142,6 +142,21 @@
}
};
}
+
+ public static class JAXWSAnnotationProperties {
+ /**
+ * represents item : JAX-WS->Annotation Properties
+ */
+ public static final IView LABEL = new IView() {
+ public String getName() { return "Annotation Properties";}
+ public List<String> getGroupPath() {
+ List<String> l = new Vector<String>();
+ l.add("JAX-WS");
+ return l;
+ }
+ };
+ }
+
public static class PluginDevelopmentPluginDependencies {
/**
* represents item : Plug-in Development->Plug-in Dependencies
12 years, 5 months
JBoss Tools SVN: r38240 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-01-27 05:18:06 -0500 (Fri, 27 Jan 2012)
New Revision: 38240
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java
Log:
[JBIDE-10721] corrected the referenced OpenShift wizard id so that the new wizard shows up again.
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java 2012-01-27 09:59:00 UTC (rev 38239)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java 2012-01-27 10:18:06 UTC (rev 38240)
@@ -73,7 +73,7 @@
//wizardIds.add("org.jboss.tools.seam.ui.wizards.SeamProjectWizard");
//wizardIds.add("org.eclipse.m2e.core.wizards.Maven2ProjectWizard");
//wizardIds.add(JBossCentralActivator.NEW_PROJECT_EXAMPLES_WIZARD_ID);
- wizardIds.add("org.jboss.ide.eclipse.as.openshift.express.ui.wizard.ImportProjectNewWizard");
+ wizardIds.add("org.jboss.ide.eclipse.as.openshift.express.ui.wizard.createNewApplicationWizard");
return wizardIds;
}
12 years, 5 months
JBoss Tools SVN: r38239 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-01-27 04:59:00 -0500 (Fri, 27 Jan 2012)
New Revision: 38239
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.0.1-SNAPSHOT.jar
Log:
added latest client jar
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.0.1-SNAPSHOT.jar
===================================================================
(Binary files differ)
12 years, 5 months
JBoss Tools SVN: r38238 - trunk/central/plugins/org.jboss.tools.central/icons.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-01-27 04:19:25 -0500 (Fri, 27 Jan 2012)
New Revision: 38238
Modified:
trunk/central/plugins/org.jboss.tools.central/icons/spring_wiz.gif
Log:
JBIDE-10627 : add new spring wizard icon
Modified: trunk/central/plugins/org.jboss.tools.central/icons/spring_wiz.gif
===================================================================
(Binary files differ)
12 years, 5 months
JBoss Tools SVN: r38237 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-01-27 03:31:34 -0500 (Fri, 27 Jan 2012)
New Revision: 38237
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java
Log:
JBIDE-10716 - small detail posting error if creds fail
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java 2012-01-27 04:48:23 UTC (rev 38236)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java 2012-01-27 08:31:34 UTC (rev 38237)
@@ -221,8 +221,8 @@
} catch(OpenShiftException ose) {
error = "Application \"" + app + "\" not found: " + ose.getMessage();
}
- ExpressWizardFragment.this.error = error;
}
+ ExpressWizardFragment.this.error = error;
}
};
}
12 years, 5 months
JBoss Tools SVN: r38236 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-01-26 23:48:23 -0500 (Thu, 26 Jan 2012)
New Revision: 38236
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java
Log:
UNIT TEST FAILURES!!!
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2012-01-27 04:04:14 UTC (rev 38235)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2012-01-27 04:48:23 UTC (rev 38236)
@@ -301,11 +301,11 @@
dKind = deltas[i].getKind();
resource = deltas[i].getModuleResource();
if( dKind == IModuleResourceDelta.ADDED ) {
- if( filter != null && filter.shouldInclude(resource)) {
+ if( filter == null || filter.shouldInclude(resource)) {
results.addAll(Arrays.asList(copy(root, new IModuleResource[]{resource})));
}
} else if( dKind == IModuleResourceDelta.CHANGED ) {
- if( filter != null && filter.shouldInclude(resource)) {
+ if( filter == null || filter.shouldInclude(resource)) {
if( resource instanceof IModuleFile )
results.addAll(Arrays.asList(copy(root, new IModuleResource[]{resource})));
results.addAll(Arrays.asList(publishChanges(server, deltas[i].getAffectedChildren(), root, filter)));
12 years, 5 months