Merge acb23cd into db2849f

OrienteerBAP · Jun 29, 2019 · 112d9c8 · 112d9c8
2 parents db2849f + acb23cd
commit 112d9c8
Show file tree

Hide file tree

Showing 13 changed files with 486 additions and 201 deletions.
diff --git a/orienteer-core/src/main/java/org/orienteer/core/OrienteerWebSession.java b/orienteer-core/src/main/java/org/orienteer/core/OrienteerWebSession.java
@@ -33,6 +33,7 @@ public static OrienteerWebSession get()
 		return (OrienteerWebSession)Session.get();
 	}
 
+
 	@Override
 	public boolean authenticate(String username, String password) {
 		boolean ret = super.authenticate(username, password);
@@ -63,9 +64,10 @@ public void signOut() {
 		super.signOut();
 	}
 
-	public OrienteerWebSession setPerspecive(ODocument perspective)
-	{
+	public OrienteerWebSession setPerspecive(ODocument perspective) {
 		this.perspective = perspective;
+		PerspectivesModule perspectivesModule = OrienteerWebApplication.get().getServiceInstance(PerspectivesModule.class);
+		perspectivesModule.updateUserPerspective(getUserAsODocument(), perspective);
 		return this;
 	}
 
@@ -80,9 +82,8 @@ public ODocument getPerspective()
 			if(perspective!=null) perspective = perspective.getRecord();
 			if(perspective==null)
 			{
-				OrienteerWebApplication app = OrienteerWebApplication.get();
-				PerspectivesModule perspectiveModule = app.getServiceInstance(PerspectivesModule.class);
-				perspective = perspectiveModule.getDefaultPerspective(getDatabase(), getEffectiveUser());
+				PerspectivesModule perspectivesModule = OrienteerWebApplication.get().getServiceInstance(PerspectivesModule.class);
+				perspective = perspectivesModule.getDefaultPerspective(getDatabase(), getEffectiveUser());
 			}
 			return (ODocument)perspective;
 

diff --git a/orienteer-core/src/main/java/org/orienteer/core/method/filters/OClassBrowseFilter.java b/orienteer-core/src/main/java/org/orienteer/core/method/filters/OClassBrowseFilter.java
@@ -3,6 +3,8 @@
 import org.apache.wicket.model.IModel;
 import org.orienteer.core.method.IMethodContext;
 import com.orientechnologies.orient.core.metadata.schema.OClass;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 
@@ -13,12 +15,19 @@
 
 public class OClassBrowseFilter extends AbstractStringFilter{
 
+	private static final Logger LOG = LoggerFactory.getLogger(OClassBrowseFilter.class);
+
 	@Override
 	public boolean isSupportedMethod(IMethodContext dataObject) {
 		IModel<?> model = dataObject.getDisplayObjectModel();
-		if (model!=null && model.getObject()!=null && model.getObject() instanceof OClass){
-			return ((OClass) (model.getObject())).isSubClassOf(this.filterData);
+		try {
+			if (model!=null && model.getObject()!=null && model.getObject() instanceof OClass){
+				return ((OClass) (model.getObject())).isSubClassOf(this.filterData);
+			}
+		} catch (Exception e) {
+			LOG.error("Error during filtering", e);
 		}
+
 		return false;
 	}
 }
diff --git a/orienteer-core/src/main/java/org/orienteer/core/method/filters/ODocumentFilter.java b/orienteer-core/src/main/java/org/orienteer/core/method/filters/ODocumentFilter.java
@@ -3,20 +3,29 @@
 import org.apache.wicket.model.IModel;
 import org.orienteer.core.method.IMethodContext;
 import com.orientechnologies.orient.core.record.impl.ODocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 
  * OFilter by ODocument class. Allow if we seen ODocument with type "fData"
  *
  */
 public class ODocumentFilter extends AbstractStringFilter{
-
+
+	private static final Logger LOG = LoggerFactory.getLogger(ODocumentFilter.class);
+
 	@Override
 	public boolean isSupportedMethod(IMethodContext dataObject) {
 		IModel<?> model = dataObject.getDisplayObjectModel();
-		if (model!=null && model.getObject()!=null && model.getObject() instanceof ODocument){
-			return ((ODocument) (model.getObject())).getSchemaClass().isSubClassOf(this.filterData);
+		try {
+			if (model!=null && model.getObject()!=null && model.getObject() instanceof ODocument){
+				return ((ODocument) (model.getObject())).getSchemaClass().isSubClassOf(this.filterData);
+			}
+		} catch (Exception e) {
+			LOG.error("Error for model: {} and context: {}", model, dataObject, e);
 		}
+
 		return false;
 	}