Author: jgbutler
Date: Sun Apr 12 22:19:33 2009
New Revision: 764339
URL: http://svn.apache.org/viewvc?rev=764339&view=rev
Log:
[Ibator] Monro changes to the eclipse plugin
Modified:
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator-src.zip
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator.jar
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/callback/EclipseProgressCallback.java
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/ExistingJavaFileVisitor.java
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/JavaFileMerger.java
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_ibatordoc.xml
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/content/AdapterFactory.java
Modified:
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator-src.zip
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator-src.zip?rev=764339&r1=764338&r2=764339&view=diff
==============================================================================
Binary files - no diff available.
Modified:
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator.jar
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.core/ibator.jar?rev=764339&r1=764338&r2=764339&view=diff
==============================================================================
Binary files - no diff available.
Modified:
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/callback/EclipseProgressCallback.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/callback/EclipseProgressCallback.java?rev=764339&r1=764338&r2=764339&view=diff
==============================================================================
---
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/callback/EclipseProgressCallback.java
(original)
+++
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/callback/EclipseProgressCallback.java
Sun Apr 12 22:19:33 2009
@@ -51,7 +51,7 @@
public void generationStarted(int totalTasks) {
currentChildProgress = parentProgress.newChild(GENERATION_FACTOR);
- currentTick = totalTasks == 0 ? GENERATION_FACTOR : GENERATION_FACTOR
/ totalTasks;
+ currentTick = totalTasks <= 0 ? GENERATION_FACTOR : GENERATION_FACTOR
/ totalTasks;
if (currentTick == 0) {
currentTick = 1;
}
@@ -61,7 +61,7 @@
public void introspectionStarted(int totalTasks) {
currentChildProgress = parentProgress.newChild(INTROSPECTION_FACTOR);
- currentTick = totalTasks == 0 ? INTROSPECTION_FACTOR :
INTROSPECTION_FACTOR / totalTasks;
+ currentTick = totalTasks <= 0 ? INTROSPECTION_FACTOR :
INTROSPECTION_FACTOR / totalTasks;
if (currentTick == 0) {
currentTick = 1;
}
@@ -71,7 +71,7 @@
public void saveStarted(int totalTasks) {
currentChildProgress = parentProgress.newChild(SAVE_FACTOR);
- currentTick = totalTasks == 0 ? SAVE_FACTOR : SAVE_FACTOR / totalTasks;
+ currentTick = totalTasks <= 0 ? SAVE_FACTOR : SAVE_FACTOR / totalTasks;
if (currentTick == 0) {
currentTick = 1;
}
Modified:
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/ExistingJavaFileVisitor.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/ExistingJavaFileVisitor.java?rev=764339&r1=764338&r2=764339&view=diff
==============================================================================
---
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/ExistingJavaFileVisitor.java
(original)
+++
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/ExistingJavaFileVisitor.java
Sun Apr 12 22:19:33 2009
@@ -44,7 +44,7 @@
}
/**
- * Find the ibator generated fields and delete them
+ * Find the Ibator generated fields and delete them
*/
@Override
public boolean visit(FieldDeclaration node) {
@@ -56,7 +56,7 @@
}
/**
- * Find the ibator generated methods and delete them
+ * Find the Ibator generated methods and delete them
*/
@Override
public boolean visit(MethodDeclaration node) {
@@ -68,7 +68,7 @@
}
/**
- * Find any ibator generated inner types and delete them
+ * Find any Ibator generated inner types and delete them
*/
@Override
public boolean visit(TypeDeclaration node) {
Modified:
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/JavaFileMerger.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/JavaFileMerger.java?rev=764339&r1=764338&r2=764339&view=diff
==============================================================================
---
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/JavaFileMerger.java
(original)
+++
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.core/src/org/apache/ibatis/ibator/eclipse/core/merge/JavaFileMerger.java
Sun Apr 12 22:19:33 2009
@@ -78,7 +78,7 @@
String existingFile = getExistingFileContents();
IDocument document = new Document(existingFile);
- // delete ibator generated stuff, and collect imports
+ // delete Ibator generated stuff, and collect imports
ExistingJavaFileVisitor visitor = new
ExistingJavaFileVisitor(javaDocTags);
astParser.setSource(existingFile.toCharArray());
@@ -106,7 +106,7 @@
SimpleType newSt = ast.newSimpleType(name);
typeDeclaration.superInterfaceTypes().add(newSt);
} else {
- // this shouldn't happen - ibator only generates simple names
+ // this shouldn't happen - Ibator only generates simple names
throw new ShellException("The Java file merger only supports
simple types as super interfaces");
}
}
@@ -119,7 +119,7 @@
SimpleType newSt = ast.newSimpleType(name);
typeDeclaration.setSuperclassType(newSt);
} else {
- // this shouldn't happen - ibator only generates simple names
+ // this shouldn't happen - Ibator only generates simple names
throw new ShellException("The Java file merger only supports
simple types as super classes");
}
} else {
@@ -270,7 +270,7 @@
File file = new File(existingFilePath);
if (!file.exists()) {
- // this should not happen because ibator only returns the path
+ // this should not happen because Ibator only returns the path
// calculated by the eclipse callback
StringBuilder sb = new StringBuilder();
sb.append("The file ");
Modified:
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_ibatordoc.xml
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_ibatordoc.xml?rev=764339&r1=764338&r2=764339&view=diff
==============================================================================
---
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_ibatordoc.xml
(original)
+++
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.doc/toc_ibatordoc.xml
Sun Apr 12 22:19:33 2009
@@ -52,6 +52,8 @@
</topic>
<topic href="html/ibatordoc/usage/oracle.html" label="Oracle">
</topic>
+ <topic href="html/ibatordoc/usage/postgresql.html" label="PostgreSQL">
+ </topic>
</topic>
<topic href="html/ibatordoc/reference/intro.html" label="Other Reference
Information">
<topic href="html/ibatordoc/reference/building.html" label="Building
Ibator From Source">
Modified:
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/content/AdapterFactory.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/content/AdapterFactory.java?rev=764339&r1=764338&r2=764339&view=diff
==============================================================================
---
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/content/AdapterFactory.java
(original)
+++
ibatis/trunk/java/tools/ibator/eclipse/org.apache.ibatis.ibator.eclipse.ui/src/org/apache/ibatis/ibator/eclipse/ui/content/AdapterFactory.java
Sun Apr 12 22:19:33 2009
@@ -28,7 +28,7 @@
/**
* This class provides a factory for different adapters used in the plugin.
- * Namely, this class decides if any particular file is an ibator configuration
+ * Namely, this class decides if any particular file is an Ibator configuration
* file or not.
*
* @author Jeff Butler
