Omaha #4204 retain part names when 4-panel swapped

Change-Id: I86b364dfe879100fa81991ab31c0e8e1122d3862

Former-commit-id: 18f76ae519 [formerly b9c5c03f403d00b7fbf0ff5d9c8ed34c82556abd]
Former-commit-id: e3409e80a4
This commit is contained in:
Nate Jensen 2015-04-02 12:06:10 -05:00
parent 38d35bd1e9
commit 7bfb787a2c

View file

@ -51,7 +51,6 @@ import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.globals.VizGlobalsManager;
import com.raytheon.uf.viz.core.maps.scales.MapScalesManager;
import com.raytheon.uf.viz.core.procedures.Bundle;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.IInputHandler;
import com.raytheon.uf.viz.core.rsc.IInputHandler.InputPriority;
import com.raytheon.uf.viz.core.time.TimeMatchingJob;
@ -95,6 +94,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Jul 15, 2014 2954 njensen Updated init() for MapScalesManager change
* Aug 25, 2014 3467 mapeters Removed changing of editability from swapPanes().
* Mar 02, 2015 4204 njensen Support for swapping part names
* Apr 02, 2015 4204 njensen Fix 4-panel swap of renamed parts
*
* </pre>
*
@ -365,7 +365,6 @@ public class SideView extends ViewPart implements IMultiPaneEditor,
}
IDisplayPane[] editorPanes = theEditor.getDisplayPanes();
AbstractVizResource<?, ?> editableResource = null;
// Set swapping so we don't get disposed, and find an editable
// resource if there is one
for (IDisplayPane dPane : editorPanes) {
@ -477,6 +476,11 @@ public class SideView extends ViewPart implements IMultiPaneEditor,
}
}
}
/*
* have to set part name again here cause addPane() or
* removePane() may mess it up
*/
theEditor.setPartName(viewName);
} else {
int min = Math.min(viewPaneCount, editorPaneCount);
for (int i = 0; i < min; ++i) {