Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
minerva
core
Commits
676746b7
Commit
676746b7
authored
Aug 20, 2020
by
Piotr Gawron
Browse files
semantic-zooming property is no longer used and removed
parent
fb31c9dd
Changes
5
Hide whitespace changes
Inline
Side-by-side
model/src/main/java/lcsb/mapviewer/model/user/UserAnnotationSchema.java
View file @
676746b7
...
...
@@ -34,7 +34,7 @@ public class UserAnnotationSchema implements Serializable {
* Default class logger.
*/
@SuppressWarnings
(
"unused"
)
private
static
Logger
logger
=
LogManager
.
getLogger
(
UserAnnotationSchema
.
class
);
private
static
Logger
logger
=
LogManager
.
getLogger
();
/**
* Unique identifier in the database.
...
...
@@ -60,7 +60,6 @@ public class UserAnnotationSchema implements Serializable {
private
Boolean
autoResizeMap
=
true
;
private
Boolean
semanticZooming
=
false
;
private
Boolean
semanticZoomContainsMultipleOverlays
=
false
;
/**
...
...
@@ -407,23 +406,6 @@ public class UserAnnotationSchema implements Serializable {
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
()
{
return
guiPreferences
;
}
...
...
persist/src/main/resources/db/migration/hsql/16.0.0~alpha.0/V16.0.0.20200821__remove_semantic_zoom.sql
0 → 100644
View file @
676746b7
alter
table
user_annotation_schema_table
drop
column
semantic_zooming
;
persist/src/main/resources/db/migration/postgres/16.0.0~alpha.0/V16.0.0.20200821__remove_semantic_zoom.sql
0 → 100644
View file @
676746b7
alter
table
user_annotation_schema_table
drop
column
semantic_zooming
;
rest-api/src/main/java/lcsb/mapviewer/api/users/UserRestImpl.java
View file @
676746b7
...
...
@@ -494,7 +494,6 @@ public class UserRestImpl extends BaseRestImpl {
result
.
put
(
"annotate-model"
,
schema
.
getAnnotateModel
());
result
.
put
(
"cache-data"
,
schema
.
getCacheData
());
result
.
put
(
"auto-resize"
,
schema
.
getAutoResizeMap
());
result
.
put
(
"semantic-zooming"
,
schema
.
getSemanticZooming
());
result
.
put
(
"semantic-zooming-contains-multiple-overlays"
,
schema
.
getSemanticZoomContainsMultipleOverlays
());
result
.
put
(
"sbgn"
,
schema
.
getSbgnFormat
());
return
result
;
...
...
@@ -637,8 +636,6 @@ public class UserRestImpl extends BaseRestImpl {
schema
.
setCacheData
(
value
);
}
else
if
(
key
.
equals
(
"auto-resize"
))
{
schema
.
setAutoResizeMap
(
value
);
}
else
if
(
key
.
equals
(
"semantic-zooming"
))
{
schema
.
setSemanticZooming
(
value
);
}
else
if
(
key
.
equals
(
"semantic-zooming-contains-multiple-overlays"
))
{
schema
.
setSemanticZoomContainsMultipleOverlays
(
value
);
}
else
if
(
key
.
equals
(
"sbgn"
))
{
...
...
web/src/test/java/lcsb/mapviewer/web/UserControllerIntegrationTest.java
View file @
676746b7
...
...
@@ -1114,9 +1114,6 @@ public class UserControllerIntegrationTest extends ControllerIntegrationTest {
fieldWithPath
(
"project-upload.sbgn"
)
.
description
(
"visualize project in sbgn-like view"
)
.
type
(
"Boolean"
),
fieldWithPath
(
"project-upload.semantic-zooming"
)
.
ignored
()
.
type
(
"Boolean"
),
fieldWithPath
(
"project-upload.semantic-zooming-contains-multiple-overlays"
)
.
description
(
"display each semantic zoom level in separate overlay."
)
.
type
(
"Boolean"
),
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment