Changeset 815

Timestamp:

06/23/2009 03:08:40 PM (15 months ago)

Author:

mbern

Message:

RollUp? beim Import ASP eingebaut
Suche nach vorhanden WorkProducts? findet jetzt mit Name statt Praesentationsname statt

Location:

trunk

Files:

• ch.ehermes.core/src/ch/ehermes/core/EPFUtil.java (modified) (1 diff)
• ch.ehermes.epf.import.ui/plugin.properties (modified) (1 diff)
• ch.ehermes.epf.import.ui/plugin_de.properties (modified) (1 diff)
• ch.ehermes.epf.import.ui/plugin_fr.properties (modified) (1 diff)
• ch.ehermes.epf.import.ui/src/ch/ehermes/epf/importing/ui/SelectWBSPage.java (modified) (4 diffs)
• ch.ehermes.epf.import.ui/src/ch/ehermes/epf/importing/wbs/ImportWBSWizard.java (modified) (3 diffs)
• ch.ehermes.epf.import/src/ch/ehermes/epf/importing/ImportWBS.java (modified) (7 diffs)

trunk/ch.ehermes.core/src/ch/ehermes/core/EPFUtil.java

@@ -275 +275 @@
         {
             String search = toks.nextToken().trim();
-            String title = search;
             int p = search.indexOf('.');
             if  ( p != -1 )
-            {
-                search = title.substring( 0, p );
-                title = title.substring(0, p) + "(" + title.substring(p+1) + ")";
-            }
+                search = search.substring( 0, p );
             if  ( list == null )
                 list = new LinkedHashMap();
             
-            ContentElement element = findWorkProductByPresentationName(pkg, search );
+            ContentElement element = findContentElement( pkg, EPFUtil.makeValidLink( search ), WorkProduct.class );
             list.put( search, element );
         }

trunk/ch.ehermes.epf.import.ui/plugin.properties

@@ -17 +17 @@
 SelectedFilesPage_ASP_Source_Roles=Roles (option)
 SelectedFilesPage_ASP_Source_WorkProducts=Work Products (option)
+SelectedFilesPage_RollUp_Option=RollUp (Arbeitsschritte konsolidieren)
 
 # Import HERMES xTract

trunk/ch.ehermes.epf.import.ui/plugin_de.properties

@@ -17 +17 @@
 SelectedFilesPage_ASP_Source_Roles=Rollen (optional)
 SelectedFilesPage_ASP_Source_WorkProducts=Ergebnisse (optional)
+SelectedFilesPage_RollUp_Option=RollUp (Arbeitsschritte konsolidieren)
 
 # Import HERMES xTract

trunk/ch.ehermes.epf.import.ui/plugin_fr.properties

@@ -17 +17 @@
 SelectedFilesPage_ASP_Source_Roles=Roles (option)
 SelectedFilesPage_ASP_Source_WorkProducts=Résultats (option)
+SelectedFilesPage_RollUp_Option=RollUp (Consolider les étapes de travail)
 
 # Import HERMES xTract

trunk/ch.ehermes.epf.import.ui/src/ch/ehermes/epf/importing/ui/SelectWBSPage.java

@@ -16 +16 @@
 import java.io.File;
 
+import org.eclipse.gmf.runtime.common.ui.preferences.CheckBoxFieldEditor;
 import org.eclipse.jface.preference.FileFieldEditor;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -42 +43 @@
     protected StringFieldEditor wbsEditorRoles;
     protected StringFieldEditor wbsEditorWorkProducts;
+    protected CheckBoxFieldEditor rollUpOptionEditor;
 
     public SelectWBSPage()
@@ -88 +90 @@
                         .getDefault().getPreferenceStore().getString( "wbsSelectWorkProducts" ) : "" );
 
+        rollUpOptionEditor = new CheckBoxFieldEditor( "rollUpOptionEditor", ImportUIPlugin.getDefault()
+                        .getString( "SelectedFilesPage_RollUp_Option" ), fileSelectionArea );
+        
         fileSelectionArea.moveAbove( null );
         setControl( fileSelectionArea );
@@ -117 +122 @@
     {
         return  ( wbsEditorWorkProducts.getStringValue() );
-    }    
+    } 
+    
+    public boolean getRollUpOption()
+    {
+        return  ( rollUpOptionEditor.getBooleanValue() );
+    }
 
     /**

trunk/ch.ehermes.epf.import.ui/src/ch/ehermes/epf/importing/wbs/ImportWBSWizard.java

@@ -132 +132 @@
         String wbsRoles;
         String wbsWorkProducts;
+        boolean rollUpOption;
 
         public ImportOperation()
@@ -143 +144 @@
             wbsRoles = wbsPage.getWbsRoles();
             wbsWorkProducts = wbsPage.getWbsWorkProducts();
+            rollUpOption = wbsPage.getRollUpOption();
         }
 
@@ -175 +177 @@
 
                 // import WBS
-                wbs.importWBSSheet( context, contentRoot, null, wbsFilename, wbsSheetname, monitor );
+                wbs.importWBSSheet( context, contentRoot, null, wbsFilename, wbsSheetname, rollUpOption, monitor );
                 
                 monitor.done();

trunk/ch.ehermes.epf.import/src/ch/ehermes/epf/importing/ImportWBS.java

@@ -23 +23 @@
 import java.util.List;
 import java.util.Map;
+import java.util.StringTokenizer;
 
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -71 +72 @@
 public class ImportWBS extends ImportContent
 {
+    // rollUP steps, default = no
+    private boolean rollUp = false;
+    
     public ImportWBS(MethodPlugin plugin, MethodConfiguration config, MultiStatus messages, IProgressMonitor monitor)
     {
@@ -139 +143 @@
         // import the others WBS categories (medium, small)
         if  ( sheets.length > 1 && sheets[1].trim().length() > 0 )
-            wbs.importWBSSheet( context, contentRoot, customRoot, wbsFile, sheets[1], monitor );
+            wbs.importWBSSheet( context, contentRoot, customRoot, wbsFile, sheets[1], false, monitor );
         if  ( sheets.length > 2 && sheets[2].trim().length() > 0 )        
-        wbs.importWBSSheet( context, contentRoot, customRoot, wbsFile, sheets[2], monitor );        
+        wbs.importWBSSheet( context, contentRoot, customRoot, wbsFile, sheets[2], false, monitor );        
 
         monitor.done();
@@ -147 +151 @@
     
     public void importWBSSheet(MethodConfiguration context, ContentPackage[] contentRoot, CustomCategory customRoot, String wbsFile, String sheetName,
-                    IProgressMonitor monitor) throws Exception
-    {
+                    boolean rollUp, IProgressMonitor monitor) throws Exception
+    {
+        this.rollUp = rollUp;
+        
         // load Excel WBS
         WBSRoot sheet = loadWBS( contentRoot, wbsFile, sheetName, monitor );
@@ -312 +318 @@
                 {
                     case    ACTIVITY_NODE:
-/*                        rollUp( name, phase, phasePkg, activityNode );
-                        break;*/
+                        if  ( rollUp )
+                        {
+                            rollUp( name, phase, phasePkg, activityNode );
+                            break;
+                        }
                         Activity activity = UmaFactory.eINSTANCE.createActivity();
                         activity.setName( EPFUtil.makeValidLink(activityNode.name) );
@@ -843 +852 @@
                     if  ( entry.getValue() != null )
                         list.put( entry.getKey(), entry.getValue() );
-                    else
-                        addMessage( IStatus.WARNING, "warning_missing_workproduct", name + ": " + task );
-                }
-        }
+                }
+        }
+        // Not all workproducts found in step without chapters (workproducts.chapter)
+        HashSet<String> wp = new HashSet<String>();
+        StringTokenizer tokens = new StringTokenizer( name, ",\n" );
+        while   ( tokens.hasMoreTokens() )
+        {
+            String search = tokens.nextToken().trim();
+            String title = search;
+            int p = search.indexOf('.');
+            if  ( p != -1 )
+                search = title.substring( 0, p );
+            wp.add( search );
+        }
+        if  ( wp.size() > list.size() )
+            addMessage( IStatus.WARNING, "warning_missing_workproduct", name + ": " + task );
+        
         return  ( list );
     }
@@ -860 +882 @@
             if  ( l != null )
                 list.addAll( l );
-            else
-                addMessage( IStatus.WARNING, "warning_missing_role", name + ": " + task );            
-        }
+        }
+        // Not all roles found in step
+        if  ( new StringTokenizer( name, ",\n" ).countTokens() > list.size() )
+            addMessage( IStatus.WARNING, "warning_missing_role", name + ": " + task );          
+        
         return  ( list );
     }