[easystruts-cvs] net.sf.easystruts/src/org/easystruts/eclipse EasyStrutsConfigModelManager.java,1.1,1.2 EasyStrutsPlugin.java,1.1,1.2

[Francois G. <far...@us...>]

Update of /cvsroot/easystruts/net.sf.easystruts/src/org/easystruts/eclipse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6376/src/org/easystruts/eclipse

Modified Files:
	EasyStrutsConfigModelManager.java EasyStrutsPlugin.java 
Log Message:
Fixed a lot of compilation errors. Still ~ 400 of them (was 650 before). This requires the plugin "org.eclipse.update.ui.forms", which is not in 3.0 or 3.1 anymore. A solution is to take it from CVS (tag R2_1_3).

Index: EasyStrutsConfigModelManager.java
===================================================================
RCS file: /cvsroot/easystruts/net.sf.easystruts/src/org/easystruts/eclipse/EasyStrutsConfigModelManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EasyStrutsConfigModelManager.java	15 Apr 2005 04:25:45 -0000	1.1
--- EasyStrutsConfigModelManager.java	27 Apr 2005 05:46:56 -0000	1.2
***************
*** 13,18 ****
  import org.eclipse.core.resources.IWorkspace;
  import org.eclipse.pde.core.IModel;
! import org.eclipse.pde.internal.core.IModelProvider;
! import org.eclipse.pde.internal.core.IModelProviderListener;
  
  /**  
--- 13,18 ----
  import org.eclipse.core.resources.IWorkspace;
  import org.eclipse.pde.core.IModel;
! import org.eclipse.pde.core.IModelProvider;
! import org.eclipse.pde.core.IModelProviderListener;
  
  /**  
***************
*** 159,163 ****
  	 * @return IModel
  	 */
! 	protected IModel createModel(Object element, boolean editable) {
  		if (element instanceof IFile) {
  			IFile file = (IFile) element;
--- 159,166 ----
  	 * @return IModel
  	 */
! 	/*
! 	 * 3.0: made private, as it seems that the getModel() has the same role... maybe shouldn't be commented out, we will see
! 	 */
! 	private IModel createModel(Object element, boolean editable) {
  		if (element instanceof IFile) {
  			IFile file = (IFile) element;
***************
*** 174,178 ****
  	 * @see org.eclipse.pde.internal.core.IModelProvider#getModel(Object, Object)
  	 */
! 	public IModel getModel(Object element, Object consumer) {
  		ModelInfo info = (ModelInfo) models.get(element);
  		if (info != null) {
--- 177,185 ----
  	 * @see org.eclipse.pde.internal.core.IModelProvider#getModel(Object, Object)
  	 */
! 	/*
! 	 * 3.0: commented out, as it seems that the getModel() below has the same role... maybe shouldn't be commented out, we will see
! 	 */
! 	/*
! 	 public IModel getModel(Object element, Object consumer) {
  		ModelInfo info = (ModelInfo) models.get(element);
  		if (info != null) {
***************
*** 185,189 ****
  		return null;
  	}
! 
  	/**
  	 * @see org.eclipse.pde.internal.core.IModelProvider#removeModelProviderListener(IModelProviderListener)
--- 192,196 ----
  		return null;
  	}
! */
  	/**
  	 * @see org.eclipse.pde.internal.core.IModelProvider#removeModelProviderListener(IModelProviderListener)
***************
*** 243,246 ****
--- 250,270 ----
        		return true;
        }
+ 	/* (non-Javadoc)
+ 	 * @see org.eclipse.pde.core.IModelProvider#getModel(org.eclipse.core.resources.IFile)
+ 	 */
+ 	public IModel getModel(IFile file) {
+ 		// TODO for 3.0: implement this one instead of the ones above
+ 		/*
+ 		ModelInfo info = (ModelInfo) models.get(file);
+ 		if (info != null) {
+ 			if (info.consumer != null && info.consumer.equals(consumer))
+ 				return info.model;
+ 			else {
+ 				return info.readOnlyModel;
+ 			}
+ 		}
+ 		*/
+ 		return null;
+ 	}
  
  }

Index: EasyStrutsPlugin.java
===================================================================
RCS file: /cvsroot/easystruts/net.sf.easystruts/src/org/easystruts/eclipse/EasyStrutsPlugin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EasyStrutsPlugin.java	15 Apr 2005 04:25:45 -0000	1.1
--- EasyStrutsPlugin.java	27 Apr 2005 05:46:56 -0000	1.2
***************
*** 83,87 ****
  import org.eclipse.core.runtime.Status;
  import org.eclipse.jface.preference.IPreferenceStore;
! import org.eclipse.pde.internal.core.IModelProvider;
  import org.eclipse.swt.widgets.Shell;
  import org.eclipse.ui.IWorkbenchPage;
--- 83,87 ----
  import org.eclipse.core.runtime.Status;
  import org.eclipse.jface.preference.IPreferenceStore;
! import org.eclipse.pde.core.IModelProvider;
  import org.eclipse.swt.widgets.Shell;
  import org.eclipse.ui.IWorkbenchPage;