[jboss-svn-commits] JBL Code SVN: r23114 - in labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools: src/org/guvnor/tools and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Sep 26 15:35:39 EDT 2008
Author: john.graham at jboss.org
Date: 2008-09-26 15:35:39 -0400 (Fri, 26 Sep 2008)
New Revision: 23114
Modified:
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorLocationManager.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/GuvnorResourceEdition.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavSessionAuthenticator.java
labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeParent.java
Log:
Minor code clean up
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF 2008-09-26 17:29:50 UTC (rev 23113)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/META-INF/MANIFEST.MF 2008-09-26 19:35:39 UTC (rev 23114)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.guvnor.tools;singleton:=true
-Bundle-Version: 0.9.0.200809041215
+Bundle-Version: 0.9.0.200809261635
Bundle-Activator: org.guvnor.tools.Activator
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorLocationManager.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorLocationManager.java 2008-09-26 17:29:50 UTC (rev 23113)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/GuvnorLocationManager.java 2008-09-26 19:35:39 UTC (rev 23114)
@@ -87,15 +87,25 @@
private void commit() throws Exception {
File repFile = Activator.getDefault().getStateLocation().
append(REP_CACHE_NAME).toFile();
- FileOutputStream fos = new FileOutputStream(repFile);
- PrintWriter writer = new PrintWriter(fos);
- for (int i = 0; i < repList.size(); i++) {
- GuvnorRepository oneRep = repList.get(i);
- writer.println(oneRep.getLocation());
+ FileOutputStream fos = null;
+ PrintWriter writer = null;
+ try {
+ fos = new FileOutputStream(repFile);
+ writer = new PrintWriter(fos);
+ for (int i = 0; i < repList.size(); i++) {
+ GuvnorRepository oneRep = repList.get(i);
+ writer.println(oneRep.getLocation());
+ }
+ writer.flush();
+ fos.flush();
+ } finally {
+ if (writer != null) {
+ writer.close();
+ }
+ if (fos != null) {
+ fos.close();
+ }
}
- writer.flush();
- fos.flush();
- fos.close();
}
private void load() throws Exception {
@@ -105,15 +115,26 @@
if (!repFile.exists()) {
return;
}
- FileInputStream fis = new FileInputStream(repFile);
- BufferedReader reader = new BufferedReader(new InputStreamReader(fis));
- String oneRep = null;
- do {
- oneRep = reader.readLine();
- if (oneRep != null && oneRep.trim().length() > 0) {
- repList.add(new GuvnorRepository(oneRep));
+ FileInputStream fis = null;
+ BufferedReader reader = null;
+ try {
+ fis = new FileInputStream(repFile);
+ reader = new BufferedReader(new InputStreamReader(fis));
+ String oneRep = null;
+ do {
+ oneRep = reader.readLine();
+ if (oneRep != null && oneRep.trim().length() > 0) {
+ repList.add(new GuvnorRepository(oneRep));
+ }
+ } while (oneRep != null);
+ } finally {
+ if (fis != null) {
+ fis.close();
}
- } while (oneRep != null);
+ if (reader != null) {
+ reader.close();
+ }
+ }
}
public interface IRepositorySetListener {
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/GuvnorResourceEdition.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/GuvnorResourceEdition.java 2008-09-26 17:29:50 UTC (rev 23113)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/actions/GuvnorResourceEdition.java 2008-09-26 19:35:39 UTC (rev 23114)
@@ -19,7 +19,6 @@
public class GuvnorResourceEdition implements IStreamContentAccessor, ITypedElement {
private String contents;
- private Image image;
private String name;
private String type;
private String encoding;
@@ -44,7 +43,7 @@
}
public Image getImage() {
- return image;
+ return null;
}
public String getName() {
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java 2008-09-26 17:29:50 UTC (rev 23113)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/GuvnorMetadataUtils.java 2008-09-26 19:35:39 UTC (rev 23114)
@@ -217,16 +217,22 @@
public static void writeGuvnorMetadataProps(File mdFile,
GuvnorMetadataProps mdProps) throws Exception {
- FileOutputStream fos = new FileOutputStream(mdFile);
- Properties props = new Properties();
- props.put("repository", mdProps.getRepository()); //$NON-NLS-1$
- props.put("fullpath", mdProps.getFullpath()); //$NON-NLS-1$
- props.put("filename", mdProps.getFilename()); //$NON-NLS-1$
- props.put("lastmodified", mdProps.getVersion()); //$NON-NLS-1$
- props.put("revision", mdProps.getRevision()); //$NON-NLS-1$
- props.store(fos, null);
- fos.flush();
- fos.close();
+ FileOutputStream fos = null;
+ try {
+ fos = new FileOutputStream(mdFile);
+ Properties props = new Properties();
+ props.put("repository", mdProps.getRepository()); //$NON-NLS-1$
+ props.put("fullpath", mdProps.getFullpath()); //$NON-NLS-1$
+ props.put("filename", mdProps.getFilename()); //$NON-NLS-1$
+ props.put("lastmodified", mdProps.getVersion()); //$NON-NLS-1$
+ props.put("revision", mdProps.getRevision()); //$NON-NLS-1$
+ props.store(fos, null);
+ fos.flush();
+ } finally {
+ if (fos != null) {
+ fos.close();
+ }
+ }
}
public static void setGuvnorMetadataProps(IPath controlledFile,
@@ -260,11 +266,16 @@
if (mdProps.getRevision() != null) {
props.put("revision", mdProps.getRevision()); //$NON-NLS-1$
}
- OutputStream os = new FileOutputStream(
- new File(mdFile.getLocation().toOSString()));
- props.store(os, null);
- os.flush();
- os.close();
+ OutputStream os = null;
+ try {
+ os = new FileOutputStream(new File(mdFile.getLocation().toOSString()));
+ props.store(os, null);
+ os.flush();
+ } finally {
+ if (os != null) {
+ os.close();
+ }
+ }
mdFolder.refreshLocal(IResource.DEPTH_INFINITE, null);
}
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavSessionAuthenticator.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavSessionAuthenticator.java 2008-09-26 17:29:50 UTC (rev 23113)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/utils/webdav/WebDavSessionAuthenticator.java 2008-09-26 19:35:39 UTC (rev 23114)
@@ -43,7 +43,7 @@
String realm,
String scheme,
Map info) {
- ServerAuthenInfo authInfo = serverAuthMaps.get(serverUrl);
+ ServerAuthenInfo authInfo = serverAuthMaps.get(serverUrl.getHost().toLowerCase());
if (authInfo == null) {
authInfo = new ServerAuthenInfo(serverUrl.getHost());
serverAuthMaps.put(serverUrl.getHost().toLowerCase(), authInfo);
Modified: labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeParent.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeParent.java 2008-09-26 17:29:50 UTC (rev 23113)
+++ labs/jbossrules/trunk/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/views/model/TreeParent.java 2008-09-26 19:35:39 UTC (rev 23114)
@@ -153,7 +153,7 @@
* @see org.eclipse.ui.progress.IDeferredWorkbenchAdapter#isContainer()
*/
public boolean isContainer() {
- return (this instanceof TreeParent);
+ return true;
}
/*
* (non-Javadoc)
More information about the jboss-svn-commits
mailing list