svn commit: r14748 - trunk/src/argouml-app/src/org/argouml/uml/reveng/java/JavaImport.java

Author: thn
Date: 2008-05-15 13:51:36-0700
New Revision: 14748

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/reveng/java/JavaImport.java

Log:
Fix for issue 4792 (Importing Classes Doesn't Include Comments)

Modified: trunk/src/argouml-app/src/org/argouml/uml/reveng/java/JavaImport.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/reveng/java/JavaImport.java?view=diff&rev=14748&p1=trunk/src/argouml-app/src/org/argouml/uml/reveng/java/JavaImport.java&p2=trunk/src/argouml-app/src/org/argouml/uml/reveng/java/JavaImport.java&r1=14747&r2=14748
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/reveng/java/JavaImport.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/reveng/java/JavaImport.java	2008-05-15 13:51:36-0700
@@ -77,11 +77,11 @@
             if (settings.getImportLevel() == ImportSettings.DETAIL_CLASSIFIER_FEATURE
                     || settings.getImportLevel() == ImportSettings.DETAIL_FULL) {
                 monitor.setMaximumProgress(files.size() * 2);
-                doImportPass(p, files, settings, monitor, 0, 1);
+                doImportPass(p, files, settings, monitor, 0, 0);
                 if (!monitor.isCanceled()) {
                     monitor.updateMainTask(Translator
                             .localize("dialog.import.pass2"));
-                    doImportPass(p, files, settings, monitor, files.size(), 2);
+                    doImportPass(p, files, settings, monitor, files.size(), 1);
                 }
             } else {
                 monitor.setMaximumProgress(files.size() * 2);
@@ -176,9 +176,9 @@
             int parserMode =
                     JavaRecognizer.MODE_IMPORT_PASS1
                             | JavaRecognizer.MODE_IMPORT_PASS2;
-            if (pass == 1) {
+            if (pass == 0) {
                 parserMode = JavaRecognizer.MODE_IMPORT_PASS1;
-            } else if (pass == 2) {
+            } else if (pass == 1) {
                 parserMode = JavaRecognizer.MODE_IMPORT_PASS2;
             }
             parser.setParserMode(parserMode);