xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #4204 ensure renamed bundle loads to tab name on next load" into omaha_15.1.1

Browse source 
Former-commit-id: d4763501ce [formerly 017e83b7f5c36b0c672b80854049f17bff023b91]
Former-commit-id: 957278d1af
This commit is contained in:
Nate Jensen 2015-03-13 09:44:50 -05:00 • committed by Gerrit Code Review
commit 12b6a1bcad
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
View file

@ -108,6 +108,7 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
* Aug 11, 2014 3480 bclement added info logging when procedure is loaded * Aug 11, 2014 3480 bclement added info logging when procedure is loaded
* Jan 06, 2015 3879 nabowle Disallow copy-in when the view is empty. * Jan 06, 2015 3879 nabowle Disallow copy-in when the view is empty.
* Mar 02, 2015 4204 njensen Copy In uses tab name if applicable * Mar 02, 2015 4204 njensen Copy In uses tab name if applicable
* Mar 12, 2015 4204 njensen Ensure renamed bundle goes into tab name on next load
* *
* </pre> * </pre>
* *
@ -577,8 +578,7 @@ public class ProcedureDlg extends CaveSWTDialog {
if (Window.OK == id.open()) { if (Window.OK == id.open()) {
String newName = id.getValue(); String newName = id.getValue();
if (newName != null if (newName != null && !newName.trim().isEmpty()) {
&& "".equals(newName.trim()) == false) {
b.name = newName; b.name = newName;
resyncProcedureAndList(); resyncProcedureAndList();
saved = false; saved = false;
@ -857,12 +857,14 @@ public class ProcedureDlg extends CaveSWTDialog {
} }
private void load() { private void load() {
if (dataList.getSelectionIndex() < 0) { int index = dataList.getSelectionIndex();
if (index < 0) {
return; return;
} }
try { try {
Bundle b = Bundle.unmarshalBundle( BundlePair selected = bundles.get(index);
bundles.get(dataList.getSelectionIndex()).xml, null); Bundle b = Bundle.unmarshalBundle(selected.xml);
b.setName(selected.name);
if (currentRdo.getSelection()) { if (currentRdo.getSelection()) {
for (IAlterBundleContributor contributor : AlterBundleFactory for (IAlterBundleContributor contributor : AlterBundleFactory
.getContributors()) { .getContributors()) {