svn commit: r14314 - trunk/src/app/src/org/argouml/uml/reveng

Author: tfmorris
Date: 2008-04-09 15:49:05-0700
New Revision: 14314

Modified:
   trunk/src/app/src/org/argouml/uml/reveng/ImportCommon.java
   trunk/src/app/src/org/argouml/uml/reveng/ImportInterface.java

Log:
Add types to Collections in ImportInterface

Modified: trunk/src/app/src/org/argouml/uml/reveng/ImportCommon.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/reveng/ImportCommon.java?view=diff&rev=14314&p1=trunk/src/app/src/org/argouml/uml/reveng/ImportCommon.java&p2=trunk/src/app/src/org/argouml/uml/reveng/ImportCommon.java&r1=14313&r2=14314
==============================================================================
--- trunk/src/app/src/org/argouml/uml/reveng/ImportCommon.java	(original)
+++ trunk/src/app/src/org/argouml/uml/reveng/ImportCommon.java	2008-04-09 15:49:05-0700
@@ -507,7 +507,7 @@
         monitor.setMaximumProgress(MAX_PROGRESS_PREPARE + MAX_PROGRESS_IMPORT);

         int progress = 0;

         monitor.updateSubTask(Translator.localize("dialog.import.preImport"));

-        List files = getFileList(monitor);

+        List<File> files = getFileList(monitor);

         progress += MAX_PROGRESS_PREPARE;

         monitor.updateProgress(progress);

         if (files.size() == 0) {

@@ -538,8 +538,8 @@
      * @param progress the actual progress until now

      * @throws ImportException exception thrown my import module

      */

-    private void doImportInternal(List filesLeft, final ProgressMonitor monitor,

-            int progress) {

+    private void doImportInternal(List<File> filesLeft,

+            final ProgressMonitor monitor, int progress) {

         Project project =  ProjectManager.getManager().getCurrentProject();

         initCurrentDiagram();

         final StringBuffer problems = new StringBuffer();


Modified: trunk/src/app/src/org/argouml/uml/reveng/ImportInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/reveng/ImportInterface.java?view=diff&rev=14314&p1=trunk/src/app/src/org/argouml/uml/reveng/ImportInterface.java&p2=trunk/src/app/src/org/argouml/uml/reveng/ImportInterface.java&r1=14313&r2=14314
==============================================================================
--- trunk/src/app/src/org/argouml/uml/reveng/ImportInterface.java	(original)
+++ trunk/src/app/src/org/argouml/uml/reveng/ImportInterface.java	2008-04-09 15:49:05-0700
@@ -1,5 +1,5 @@
 // $Id$

-// Copyright (c) 2006-2007 The Regents of the University of California. All

+// Copyright (c) 2006-2008 The Regents of the University of California. All

 // Rights Reserved. Permission to use, copy, modify, and distribute this

 // software and its documentation without fee, and without a written

 // agreement is hereby granted, provided that the above copyright notice

@@ -101,16 +101,16 @@
      *             if an error occurs, this will contain the nested exception

      *             that was originally thrown

      */

-    Collection parseFiles(Project p, final Collection files,

+    Collection parseFiles(Project p, final Collection<File> files,

             ImportSettings settings, ProgressMonitor monitor)

         throws ImportException;

 

     /**

      * Returns a list with objects that represent settings for this import.

-     * These objects implement the ImportTypes.* interfaces.

+     * These objects implement the SettingsTypes.* interfaces.

      * <p>

      * The caller must determine what interface an object is implementing

-     * iterating the interfaces ImportTypes.*

+     * iterating the interfaces SettingsTypes.*

      * <p>

      * This is done this way to eliminate the need to use GUI elements. The

      * settings can easily be mapped into any GUI elements, this way we are

@@ -118,7 +118,7 @@
      * 

      * @return the list of settings that are required by this particular import

      */

-    List getImportSettings();

+    List<SettingsTypes.Setting> getImportSettings();

     

     

     /**

@@ -127,6 +127,12 @@
      */

     public class ImportException extends Exception {

 

+        /**

+         * Construct an ImportException with a wrapped Throwable.

+         * 

+         * @param message message indicating error that occurred

+         * @param cause the wrapped Exception

+         */

         public ImportException(String message, Throwable cause) {

             super("Import Exception : " + message, cause);

         }