From c1fdb1d0c6a71998cad11cd1e40b516daa69bef4 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Mon, 16 Dec 2013 17:33:36 +0000
Subject: [PATCH] filter for operation list into history was sorted

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@86990 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                            |  2 +-
 .settings/org.eclipse.jdt.core.prefs                  |  6 +++---
 .../org.eclipse.wst.common.project.facet.core.xml     |  2 +-
 pom.xml                                               |  8 ++++----
 .../windows/accounting/AccoutingInfoContainer.java    | 11 +++++++++--
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.classpath b/.classpath
index b5d87bd..dfe88e5 100644
--- a/.classpath
+++ b/.classpath
@@ -13,7 +13,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER/gwt-2.5.1"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 69c31cd..443e085 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index c78d932..4f92af5 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <installed facet="java" version="1.6"/>
   <installed facet="jst.utility" version="1.0"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>
diff --git a/pom.xml b/pom.xml
index 16ae29a..1dc4463 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,8 +25,8 @@
 		<gwtVersion>2.5.1</gwtVersion>
 		<distroDirectory>distro</distroDirectory>
 		<!-- GWT needs at least java 1.6 -->
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.7</maven.compiler.source>
+		<maven.compiler.target>1.7</maven.compiler.target>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -212,8 +212,8 @@
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>${maven.compiler.source}</source>
+					<target>${maven.compiler.target}</target>
 				</configuration>
 			</plugin>
 
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java
index 5a93bdb..a4fa649 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/accounting/AccoutingInfoContainer.java
@@ -1,6 +1,7 @@
 package org.gcube.portlets.user.workspace.client.view.windows.accounting;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -287,14 +288,20 @@ public class AccoutingInfoContainer extends LayoutContainer {
 			
 			if(hashOperation.get(gxtAccountingField.getOperation().getId())==null){
 				hashOperation.put(gxtAccountingField.getOperation().getId(), "");
-				typeStoreOperation.add(type((gxtAccountingField.getOperation().getId())));
+//				typeStoreOperation.add(type((gxtAccountingField.getOperation().getId())));
 			}
-			
+
 			baseModel.set(AUTHOR, gxtAccountingField.getUser().getName());
 			baseModel.set(DATE, gxtAccountingField.getDate());
 
 			listModelData.add(baseModel);
 		}
+		
+		List<String> operationKeys = new ArrayList<String>(hashOperation.keySet());
+		Collections.sort(operationKeys);
+		for (String key : operationKeys) {
+			typeStoreOperation.add(type(key));
+		}
 
 		store.add(listModelData);
 	}