diff --git a/.classpath b/.classpath
index b5d87bd..dfe88e5 100644
--- a/.classpath
+++ b/.classpath
@@ -13,7 +13,7 @@
-
+
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 @@
-
+
diff --git a/pom.xml b/pom.xml
index 16ae29a..1dc4463 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,8 +25,8 @@
2.5.1
distro
- 1.6
- 1.6
+ 1.7
+ 1.7
UTF-8
UTF-8
@@ -212,8 +212,8 @@
maven-compiler-plugin
-
- 1.6
+
+ ${maven.compiler.target}
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 operationKeys = new ArrayList(hashOperation.keySet());
+ Collections.sort(operationKeys);
+ for (String key : operationKeys) {
+ typeStoreOperation.add(type(key));
+ }
store.add(listModelData);
}