Author: scabanovich Date: 2008-06-07 04:04:48 -0400 (Sat, 07 Jun 2008) New Revision: 8624 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/GroupAdopt.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OutputMoveHandler.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectOnDiagramHandler.java Log: Casting to implementation is replaced with casting to interfaces where possible. Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/GroupAdopt.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/GroupAdopt.java 2008-06-07 01:03:38 UTC (rev 8623) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/GroupAdopt.java 2008-06-07 08:04:48 UTC (rev 8624) @@ -17,6 +17,7 @@ import org.jboss.tools.common.model.*; import org.jboss.tools.jsf.model.*; import org.jboss.tools.jsf.model.helpers.*; +import org.jboss.tools.jst.web.model.ReferenceObject; public class GroupAdopt implements XAdoptManager, JSFConstants { @@ -54,7 +55,7 @@ private boolean canMoveCase(XModelObject target, XModelObject object) { XModelObject case_ = null; if(object instanceof ReferenceObjectImpl) { - case_ = ((ReferenceObjectImpl)object).getReference(); + case_ = ((ReferenceObject)object).getReference(); } else { case_ = object; } @@ -83,7 +84,7 @@ } protected void adoptOutput(XModelObject source, XModelObject target, Properties p) throws XModelException { - ReferenceObjectImpl i = (ReferenceObjectImpl)source; + ReferenceObject i = (ReferenceObject)source; adoptCase(i.getReference(), target, p); } @@ -92,7 +93,7 @@ } protected void adoptItem(XModelObject source, XModelObject target, Properties p) throws XModelException { - ReferenceObjectImpl i = (ReferenceObjectImpl)source; + ReferenceObject i = (ReferenceObject)source; adoptRule(i.getReference(), target, p); } @@ -135,7 +136,7 @@ } void moveOutput(XModelObject source, XModelObject target, Properties p) throws XModelException { - ReferenceObjectImpl i = (ReferenceObjectImpl)source; + ReferenceObject i = (ReferenceObject)source; moveCase(i.getReference(), target, p); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OutputMoveHandler.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OutputMoveHandler.java 2008-06-07 01:03:38 UTC (rev 8623) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/OutputMoveHandler.java 2008-06-07 08:04:48 UTC (rev 8624) @@ -16,13 +16,14 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.XOrderedObject; import org.jboss.tools.jsf.model.ReferenceObjectImpl; +import org.jboss.tools.jst.web.model.ReferenceObject; public class OutputMoveHandler extends MoveHandler { public void executeHandler(XModelObject object, Properties prop) throws XModelException { - if(!isEnabled(object)) return; - ReferenceObjectImpl o1 = (ReferenceObjectImpl)object; - ReferenceObjectImpl o2 = (ReferenceObjectImpl)object.getModel().getModelBuffer().source(); + if(!isEnabled(object)) return;int ii = 0; + ReferenceObject o1 = (ReferenceObject)object; + ReferenceObject o2 = (ReferenceObject)object.getModel().getModelBuffer().source(); XModelObject r1 = o1.getReference(); XModelObject r2 = o2.getReference(); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java 2008-06-07 01:03:38 UTC (rev 8623) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java 2008-06-07 08:04:48 UTC (rev 8624) @@ -22,12 +22,13 @@ import org.jboss.tools.jsf.model.*; import org.jboss.tools.jsf.model.helpers.*; import org.jboss.tools.jsf.model.impl.NavigationRuleObjectImpl; +import org.jboss.tools.jst.web.model.ReferenceObject; public class RenameViewSupport extends SpecialWizardSupport implements JSFConstants { String initialPath; ReferenceGroupImpl group; XModelObject page; - ReferenceObjectImpl item; + ReferenceObject item; public void reset() { initGroup(); @@ -44,7 +45,7 @@ group = (ReferenceGroupImpl)getTarget(); } else if(ENT_PROCESS_ITEM.equals(entity)) { group = (ReferenceGroupImpl)getTarget().getParent(); - if(group.getChildren().length > 1) item = (ReferenceObjectImpl)getTarget(); + if(group.getChildren().length > 1) item = (ReferenceObject)getTarget(); } } @@ -149,7 +150,7 @@ XModelObject[] os = is[j].getChildren(ENT_PROCESS_ITEM_OUTPUT); for (int k = 0; k < os.length ; k++) { if(!oldPath.equals(os[k].getAttributeValue(ATT_PATH))) continue; - ReferenceObjectImpl output = (ReferenceObjectImpl)os[k]; + ReferenceObject output = (ReferenceObject)os[k]; XModelObject c = output.getReference(); if(c != null) { model.changeObjectAttribute(c, ATT_TO_VIEW_ID, newPath); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectOnDiagramHandler.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectOnDiagramHandler.java 2008-06-07 01:03:38 UTC (rev 8623) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/SelectOnDiagramHandler.java 2008-06-07 08:04:48 UTC (rev 8624) @@ -16,6 +16,7 @@ import org.jboss.tools.common.meta.action.impl.*; import org.jboss.tools.jsf.model.*; import org.jboss.tools.jsf.model.helpers.JSFProcessStructureHelper; +import org.jboss.tools.jst.web.model.ReferenceObject; public class SelectOnDiagramHandler extends AbstractHandler implements JSFConstants { @@ -43,8 +44,8 @@ ReferenceGroupImpl g = (ReferenceGroupImpl)processObject; XModelObject[] rs = g.getReferences(); if(rs != null && rs.length == 1 && rs[0] == object) return g; - } else if(processObject instanceof ReferenceObjectImpl) { - if(((ReferenceObjectImpl)processObject).getReference() == object) return processObject; + } else if(processObject instanceof ReferenceObject) { + if(((ReferenceObject)processObject).getReference() == object) return processObject; } return getItemOnProcess(processObject.getChildren(), object); }