JBoss Tools SVN: r7405 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model: engines/impl and 8 other directories.
7:22 a.m.
Author: scabanovich
Date: 2008-04-08 08:22:42 -0400 (Tue, 08 Apr 2008)
New Revision: 7405
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemFolderLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/example/FileMainLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/MoveHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XObjectLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/BodyLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/DefaultEntityLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/FileRootLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/RootLoaderImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/RootXStudioLoaderImpl.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/WatcherLoader.java
Log:
JBIDE-893
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/XModel.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -201,7 +201,7 @@
* Implementation of the method invokes update() method on
* object loader of root object.
*/
- public void update();
+ public void update() throws XModelException;
/**
* Saves the model.
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -54,18 +54,13 @@
return b;
}
- public boolean update(XModelObject object) {
+ public boolean update(XModelObject object) throws XModelException {
if(!isFilePath(getPath(object))) return true;
File f = file(object);
if(!object.getModel().getFileRegistry().isUpdated(f)) return true;
XModelObject c = object.copy(0);
load(c);
- try {
- merge(object, c);
- } catch (XModelException e) {
- //TODO this method should throw XModelException
- throw new RuntimeException(e);
- }
+ merge(object, c);
return true;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemFolderLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemFolderLoader.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemFolderLoader.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -19,7 +19,7 @@
public void load(XModelObject object) {}
- public boolean update(XModelObject object) {
+ public boolean update(XModelObject object) throws XModelException {
FolderLoader folder = (FolderLoader)object;
if(folder.isRemoved() && !isProtectedFileSystem(object)) {
object.getParent().setModified(true);
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileSystemsLoader.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -57,7 +57,7 @@
return b;
}
- public boolean update(XModelObject object) {
+ public boolean update(XModelObject object) throws XModelException {
boolean b = true;
XModelObject[] cs = object.getChildren();
for (int i = 0; i < cs.length; i++) {
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/example/FileMainLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/example/FileMainLoader.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/example/FileMainLoader.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -32,7 +32,7 @@
XModelObjectLoaderUtil.getObjectLoader(ext).load(ext);
}
- public boolean update(XModelObject object) {
+ public boolean update(XModelObject object) throws XModelException {
FileAnyImpl c = (FileAnyImpl)object.copy(0);
XModelObject p = object.getParent();
FolderLoader fl = (FolderLoader)p;
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelImpl.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -418,7 +418,7 @@
}
}
- public void update() {
+ public void update() throws XModelException {
XModelObject r = getRoot();
XModelObjectLoaderUtil.getObjectLoader(r).update(r);
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/MoveHandler.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/MoveHandler.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/java/handlers/MoveHandler.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -37,7 +37,7 @@
return new MoveAction(site);
}
- protected void run(SiteWrapper site, SelectionDispatchAction action, XModelObject
object) {
+ protected void run(SiteWrapper site, SelectionDispatchAction action, XModelObject
object) throws XModelException {
IResource file = EclipseResourceUtil.getResource(object);
action.selectionChanged(new
SelectionChangedEvent(ModelPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite().getSelectionProvider(),
new StructuredSelection(file)));
if(file != null) {
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XObjectLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XObjectLoader.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/XObjectLoader.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -10,11 +10,12 @@
******************************************************************************/
package org.jboss.tools.common.model.loaders;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
public interface XObjectLoader {
public void load(XModelObject object);
- public boolean update(XModelObject object);
+ public boolean update(XModelObject object) throws XModelException;
public boolean save(XModelObject object);
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/BodyLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/BodyLoader.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/BodyLoader.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -23,7 +23,7 @@
object.setAttributeValue("body", body);
}
- public boolean update(XModelObject object) {
+ public boolean update(XModelObject object) throws XModelException {
load(object);
return true;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/DefaultEntityLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/DefaultEntityLoader.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/DefaultEntityLoader.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -29,7 +29,7 @@
if(e != null) util().load(e, object);
}
- public boolean update(XModelObject object) {
+ public boolean update(XModelObject object) throws XModelException {
XModelObject c = object.copy(0);
XModelObjectLoaderUtil.setTempBody(c,
XModelObjectLoaderUtil.getTempBody(object));
load(c);
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/FileRootLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/FileRootLoader.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/FileRootLoader.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -28,7 +28,7 @@
util().load(file(object), object);
}
- public boolean update(XModelObject object) {
+ public boolean update(XModelObject object) throws XModelException {
return true;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/PropertiesLoader.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -121,7 +121,7 @@
}
}
- public boolean update(XModelObject object) {
+ public boolean update(XModelObject object) throws XModelException {
XModelObject c = object.copy(0);
XModelObjectLoaderUtil.setTempBody(c, XModelObjectLoaderUtil.getTempBody(object));
load(c);
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/RootLoaderImpl.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/RootLoaderImpl.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/RootLoaderImpl.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -36,7 +36,7 @@
}
}
- public boolean update(XModelObject object) {
+ public boolean update(XModelObject object) throws XModelException {
XModelObject[] children = object.getChildren();
boolean b = true;
for (int i = 0; i < children.length; i++) {
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders/impl/SimpleWebFileLoader.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -135,7 +135,7 @@
object.setAttributeValue(XModelObjectConstants.ATTR_NAME_ENCODING, encoding);
}
- public boolean update(XModelObject object) {
+ public boolean update(XModelObject object) throws XModelException {
XModelObject p = object.getParent();
if (p == null) return true;
FolderLoader fl = (FolderLoader)p;
@@ -145,10 +145,6 @@
f.setUpdateLock();
try {
f.edit(body);
- } catch (XModelException e) {
- ModelPlugin.getPluginLog().logError(e);
- //TODO update method should throw XModelException
- throw new RuntimeException(e);
} finally {
f.releaseUpdateLock();
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/RootXStudioLoaderImpl.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/RootXStudioLoaderImpl.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/RootXStudioLoaderImpl.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.common.model.options.impl;
+import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.loaders.*;
@@ -21,7 +22,7 @@
new XStudioDataLoaderImpl().load(object);
}
- public boolean update(XModelObject object) {
+ public boolean update(XModelObject object) throws XModelException {
return true;
}
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/WatcherLoader.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/WatcherLoader.java 2008-04-08
12:22:15 UTC (rev 7404)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/WatcherLoader.java 2008-04-08
12:22:42 UTC (rev 7405)
@@ -25,7 +25,7 @@
Watcher.getInstance(object.getModel()).forceUpdate();
}
- public boolean update(XModelObject object) {
+ public boolean update(XModelObject object) throws XModelException {
return true;
}
6581
days inactive
6581
days old
jbosstools-commits@lists.jboss.org
0 comments
1 participants
participants (1)
-
jbosstools-commits＠lists.jboss.org