git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-247 pass idwidth parameter to IdCanvas.drawMarker
[jalview.git]
/
src
/
jalview
/
gui
/
AlignFrame.java
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
0239bb4
..
fcb6572
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-33,6
+33,7
@@
import jalview.api.AlignViewControllerI;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.api.FeatureSettingsControllerI;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.api.FeatureSettingsControllerI;
+import jalview.api.FeatureSettingsModelI;
import jalview.api.SplitContainerI;
import jalview.api.ViewStyleI;
import jalview.api.analysis.SimilarityParamsI;
import jalview.api.SplitContainerI;
import jalview.api.ViewStyleI;
import jalview.api.analysis.SimilarityParamsI;
@@
-2092,7
+2093,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
newGraphGroups.add(q, null);
}
newGraphGroups.set(newann.graphGroup,
newGraphGroups.add(q, null);
}
newGraphGroups.set(newann.graphGroup,
- new Integer(++fgroup));
+ Integer.valueOf(++fgroup));
}
newann.graphGroup = newGraphGroups.get(newann.graphGroup)
.intValue();
}
newann.graphGroup = newGraphGroups.get(newann.graphGroup)
.intValue();
@@
-2139,7
+2140,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
newGraphGroups.add(q, null);
}
newGraphGroups.set(newann.graphGroup,
newGraphGroups.add(q, null);
}
newGraphGroups.set(newann.graphGroup,
- new Integer(++fgroup));
+ Integer.valueOf(++fgroup));
}
newann.graphGroup = newGraphGroups.get(newann.graphGroup)
.intValue();
}
newann.graphGroup = newGraphGroups.get(newann.graphGroup)
.intValue();
@@
-4491,7
+4492,8
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
int assocfiles = 0;
if (filesmatched.size() > 0)
{
int assocfiles = 0;
if (filesmatched.size() > 0)
{
- boolean autoAssociate = Cache.getDefault("AUTOASSOCIATE_PDBANDSEQS", false);
+ boolean autoAssociate = Cache
+ .getDefault("AUTOASSOCIATE_PDBANDSEQS", false);
if (!autoAssociate)
{
String msg = MessageManager.formatMessage(
if (!autoAssociate)
{
String msg = MessageManager.formatMessage(
@@
-4934,6
+4936,13
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
@Override
public void finished()
{
@Override
public void finished()
{
+
+ for (FeatureSettingsModelI srcSettings : dbRefFetcher
+ .getFeatureSettingsModels())
+ {
+
+ alignPanel.av.mergeFeaturesStyle(srcSettings);
+ }
AlignFrame.this.setMenusForViewport();
}
});
AlignFrame.this.setMenusForViewport();
}
});
@@
-5019,6
+5028,10
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
@Override
public void finished()
{
@Override
public void finished()
{
+ FeatureSettingsModelI srcSettings = dassource[0]
+ .getFeatureColourScheme();
+ alignPanel.av.mergeFeaturesStyle(
+ srcSettings);
AlignFrame.this.setMenusForViewport();
}
});
AlignFrame.this.setMenusForViewport();
}
});