[overlord-commits] Overlord SVN: r316 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb: model and 1 other directory.

[overlord-commits at lists.jboss.org]

Author: objectiser
Date: 2008-09-07 18:14:18 -0400 (Sun, 07 Sep 2008)
New Revision: 316

Modified:
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/editor/JBossESBConfigEditorManager.java
   cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java
Log:
Updated to reflect change in resolution mechanism.

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/editor/JBossESBConfigEditorManager.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/editor/JBossESBConfigEditorManager.java	2008-09-07 16:03:45 UTC (rev 315)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/editor/JBossESBConfigEditorManager.java	2008-09-07 22:14:18 UTC (rev 316)
@@ -20,6 +20,7 @@
 package org.jboss.tools.overlord.cdl.jbossesb.editor;
 
 import org.scribble.extensions.RegistryInfo;
+import org.scribble.model.ModelReference;
 import org.scribble.model.SourceRef;
 import org.scribble.editor.AbstractEditorManager;
 import org.scribble.editor.EditorManager;
@@ -33,16 +34,26 @@
 public class JBossESBConfigEditorManager extends AbstractEditorManager {
 
 	/**
-	 * This method focuses the editor on the specified source
-	 * file, associated with the supplied URI, and the component
-	 * within that file, identified by the source reference.
+	 * This method focuses the editor on the specified source,
+	 * identified by the model reference and source reference.
 	 * 
-	 * @param uri The source file URI
-	 * @param ref The component source reference
+	 * @param mref The model reference
+	 * @param sref The component source reference
 	 * @param prop Additional properties
 	 */
-	public void focus(String uri, SourceRef ref,
+	public void focus(ModelReference mref, SourceRef sref,
 					java.util.Map<String,Object> props) {
+		String uri=null;
+		org.eclipse.core.resources.IFile file=
+			org.scribble.osgi.model.OSGIModelRepository.getFile(mref);
+	
+		if (file == null || file.exists() == false) {
+			file = org.scribble.osgi.model.OSGIModelRepository.getGlobalFile(mref);
+		}
+	
+		if (file != null && file.exists()) {
+			uri = file.getFullPath().toPortableString();
+		}
 		
 		if (uri != null) {
 			org.eclipse.ui.IWorkbenchPage page=
@@ -65,8 +76,8 @@
 						org.eclipse.ui.texteditor.ITextEditor editor=
 							(org.eclipse.ui.texteditor.ITextEditor)part;
 						
-						editor.selectAndReveal(ref.getStartPosition(),
-								ref.getEndPosition()-ref.getStartPosition());
+						editor.selectAndReveal(sref.getStartPosition(),
+								sref.getEndPosition()-sref.getStartPosition());
 					}
 					
 				} catch(Exception e) {

Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java	2008-09-07 16:03:45 UTC (rev 315)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.jbossesb/src/java/org/jboss/tools/overlord/cdl/jbossesb/model/DefaultESBLanguageModel.java	2008-09-07 22:14:18 UTC (rev 316)
@@ -22,6 +22,7 @@
 import org.scribble.conversation.model.*;
 import org.scribble.extensions.RegistryFactory;
 import org.scribble.model.*;
+import org.scribble.model.resolutions.*;
 
 /**
  * This class represents an ESB model.
@@ -631,6 +632,7 @@
 		
 		public void error(ModelIssue issue) {
 						
+			/*
 			issue.getProperties().put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION);
 			issue.getProperties().put(ModelListener.REFERENCE_MODEL, m_source);
 			issue.getProperties().put(ModelListener.REFERENCE_MODEL_START_POSITION,
@@ -641,11 +643,17 @@
 				issue.getProperties().put(ModelListener.REFERENCE_MODEL_COMPONENT,
 						issue.getModelObject().getSource().getComponentURI());
 			}
+			*/
+			ShowReferencedDescription res=new ShowReferencedDescription();
+			res.setModel(m_source);
 			
+			issue.getResolutions().add(res);
+			
 			m_listener.error(issue);
 		}
 
 		public void warning(ModelIssue issue) {
+			/*
 			issue.getProperties().put(ModelListener.RESOLUTIONS, ModelListener.SHOW_REFERENCE_DESCRIPTION_RESOLUTION);
 			issue.getProperties().put(ModelListener.REFERENCE_MODEL, m_source);
 			issue.getProperties().put(ModelListener.REFERENCE_MODEL_START_POSITION,
@@ -656,7 +664,13 @@
 				issue.getProperties().put(ModelListener.REFERENCE_MODEL_COMPONENT,
 						issue.getModelObject().getSource().getComponentURI());
 			}
+			*/
 			
+			ShowReferencedDescription res=new ShowReferencedDescription();
+			res.setModel(m_source);
+			
+			issue.getResolutions().add(res);
+
 			m_listener.warning(issue);
 		}