Commit 676746b7 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

semantic-zooming property is no longer used and removed

parent fb31c9dd
...@@ -34,7 +34,7 @@ public class UserAnnotationSchema implements Serializable { ...@@ -34,7 +34,7 @@ public class UserAnnotationSchema implements Serializable {
* Default class logger. * Default class logger.
*/ */
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static Logger logger = LogManager.getLogger(UserAnnotationSchema.class); private static Logger logger = LogManager.getLogger();
/** /**
* Unique identifier in the database. * Unique identifier in the database.
...@@ -60,7 +60,6 @@ public class UserAnnotationSchema implements Serializable { ...@@ -60,7 +60,6 @@ public class UserAnnotationSchema implements Serializable {
private Boolean autoResizeMap = true; private Boolean autoResizeMap = true;
private Boolean semanticZooming = false;
private Boolean semanticZoomContainsMultipleOverlays = false; private Boolean semanticZoomContainsMultipleOverlays = false;
/** /**
...@@ -407,23 +406,6 @@ public class UserAnnotationSchema implements Serializable { ...@@ -407,23 +406,6 @@ public class UserAnnotationSchema implements Serializable {
this.autoResizeMap = autoResizeMap; this.autoResizeMap = autoResizeMap;
} }
/**
* @return the semanticZooming
* @see #semanticZooming
*/
public Boolean getSemanticZooming() {
return semanticZooming;
}
/**
* @param semanticZooming
* the semanticZooming to set
* @see #semanticZooming
*/
public void setSemanticZooming(Boolean semanticZooming) {
this.semanticZooming = semanticZooming;
}
public Set<UserGuiPreference> getGuiPreferences() { public Set<UserGuiPreference> getGuiPreferences() {
return guiPreferences; return guiPreferences;
} }
......
alter table user_annotation_schema_table drop column semantic_zooming;
...@@ -494,7 +494,6 @@ public class UserRestImpl extends BaseRestImpl { ...@@ -494,7 +494,6 @@ public class UserRestImpl extends BaseRestImpl {
result.put("annotate-model", schema.getAnnotateModel()); result.put("annotate-model", schema.getAnnotateModel());
result.put("cache-data", schema.getCacheData()); result.put("cache-data", schema.getCacheData());
result.put("auto-resize", schema.getAutoResizeMap()); result.put("auto-resize", schema.getAutoResizeMap());
result.put("semantic-zooming", schema.getSemanticZooming());
result.put("semantic-zooming-contains-multiple-overlays", schema.getSemanticZoomContainsMultipleOverlays()); result.put("semantic-zooming-contains-multiple-overlays", schema.getSemanticZoomContainsMultipleOverlays());
result.put("sbgn", schema.getSbgnFormat()); result.put("sbgn", schema.getSbgnFormat());
return result; return result;
...@@ -637,8 +636,6 @@ public class UserRestImpl extends BaseRestImpl { ...@@ -637,8 +636,6 @@ public class UserRestImpl extends BaseRestImpl {
schema.setCacheData(value); schema.setCacheData(value);
} else if (key.equals("auto-resize")) { } else if (key.equals("auto-resize")) {
schema.setAutoResizeMap(value); schema.setAutoResizeMap(value);
} else if (key.equals("semantic-zooming")) {
schema.setSemanticZooming(value);
} else if (key.equals("semantic-zooming-contains-multiple-overlays")) { } else if (key.equals("semantic-zooming-contains-multiple-overlays")) {
schema.setSemanticZoomContainsMultipleOverlays(value); schema.setSemanticZoomContainsMultipleOverlays(value);
} else if (key.equals("sbgn")) { } else if (key.equals("sbgn")) {
......
...@@ -1114,9 +1114,6 @@ public class UserControllerIntegrationTest extends ControllerIntegrationTest { ...@@ -1114,9 +1114,6 @@ public class UserControllerIntegrationTest extends ControllerIntegrationTest {
fieldWithPath("project-upload.sbgn") fieldWithPath("project-upload.sbgn")
.description("visualize project in sbgn-like view") .description("visualize project in sbgn-like view")
.type("Boolean"), .type("Boolean"),
fieldWithPath("project-upload.semantic-zooming")
.ignored()
.type("Boolean"),
fieldWithPath("project-upload.semantic-zooming-contains-multiple-overlays") fieldWithPath("project-upload.semantic-zooming-contains-multiple-overlays")
.description("display each semantic zoom level in separate overlay.") .description("display each semantic zoom level in separate overlay.")
.type("Boolean"), .type("Boolean"),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment