Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
minerva
core
Commits
d67bd59c
Commit
d67bd59c
authored
7 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
comparator includes semantic zoom levels
parent
cef91833
No related branches found
No related tags found
1 merge request
!30
Fixes on showing semantic in compartments
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
model/src/main/java/lcsb/mapviewer/model/map/species/ElementComparator.java
+9
-2
9 additions, 2 deletions
...a/lcsb/mapviewer/model/map/species/ElementComparator.java
with
9 additions
and
2 deletions
model/src/main/java/lcsb/mapviewer/model/map/species/ElementComparator.java
+
9
−
2
View file @
d67bd59c
...
@@ -84,8 +84,9 @@ public class ElementComparator implements Comparator<Element> {
...
@@ -84,8 +84,9 @@ public class ElementComparator implements Comparator<Element> {
}
}
/**
/**
* This method compares only the fields that are defined in {@link Element} class in
* This method compares only the fields that are defined in {@link Element}
* inheritence tree. By the design it is called by subclass comparator.
* class in inheritence tree. By the design it is called by subclass
* comparator.
*
*
* @param arg0
* @param arg0
* first object to compare
* first object to compare
...
@@ -188,6 +189,12 @@ public class ElementComparator implements Comparator<Element> {
...
@@ -188,6 +189,12 @@ public class ElementComparator implements Comparator<Element> {
return
stringComparator
.
compare
(
arg0
.
getFormula
(),
arg1
.
getFormula
());
return
stringComparator
.
compare
(
arg0
.
getFormula
(),
arg1
.
getFormula
());
}
}
if
(
stringComparator
.
compare
(
arg0
.
getSemanticZoomLevelVisibility
(),
arg1
.
getSemanticZoomLevelVisibility
())
!=
0
)
{
logger
.
debug
(
"SemanticZoomLevelVisibility different: \""
+
arg0
.
getSemanticZoomLevelVisibility
()
+
"\", \""
+
arg1
.
getSemanticZoomLevelVisibility
()
+
"\""
);
return
stringComparator
.
compare
(
arg0
.
getSemanticZoomLevelVisibility
(),
arg1
.
getSemanticZoomLevelVisibility
());
}
StringSetComparator
stringSetComparator
=
new
StringSetComparator
();
StringSetComparator
stringSetComparator
=
new
StringSetComparator
();
StringListComparator
stringListComparator
=
new
StringListComparator
();
StringListComparator
stringListComparator
=
new
StringListComparator
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment