|
Lines 628-633
Link Here
|
| 628 |
Component curC = null; |
628 |
Component curC = null; |
| 629 |
for (Iterator iter = tabs.iterator(); iter.hasNext();) { |
629 |
for (Iterator iter = tabs.iterator(); iter.hasNext();) { |
| 630 |
curC = toComp ((TabData) iter.next()); |
630 |
curC = toComp ((TabData) iter.next()); |
|
|
631 |
if (curC.getParent() != null) { |
| 632 |
curC.getParent().remove(curC); |
| 633 |
} |
| 631 |
// string parameter is needed for StackLayout to kick in correctly |
634 |
// string parameter is needed for StackLayout to kick in correctly |
| 632 |
contentDisplayer.add(curC, ""); |
635 |
contentDisplayer.add(curC, ""); |
| 633 |
} |
636 |
} |
|
Lines 1123-1128
Link Here
|
| 1123 |
container.getSelectionModel().getSelectedIndex(); |
1126 |
container.getSelectionModel().getSelectedIndex(); |
| 1124 |
|
1127 |
|
| 1125 |
if (add) { |
1128 |
if (add) { |
|
|
1129 |
if (nue.getParent() != null) { |
| 1130 |
nue.getParent().remove(nue); |
| 1131 |
} |
| 1126 |
contentDisplayer.add(nue, index); |
1132 |
contentDisplayer.add(nue, index); |
| 1127 |
} |
1133 |
} |
| 1128 |
} |
1134 |
} |
|
Lines 1162-1167
Link Here
|
| 1162 |
Component curC = null; |
1168 |
Component curC = null; |
| 1163 |
for (int i = e.getIndex0(); i <= e.getIndex1(); i++) { |
1169 |
for (int i = e.getIndex0(); i <= e.getIndex1(); i++) { |
| 1164 |
curC = toComp(container.getModel().getTab(i)); |
1170 |
curC = toComp(container.getModel().getTab(i)); |
|
|
1171 |
if (curC.getParent() != null) { |
| 1172 |
curC.getParent().remove(curC); |
| 1173 |
} |
| 1165 |
contentDisplayer.add(curC, ""); |
1174 |
contentDisplayer.add(curC, ""); |
| 1166 |
} |
1175 |
} |
| 1167 |
} |
1176 |
} |
|
Lines 1184-1189
Link Here
|
| 1184 |
int[] indices = e.getIndices(); |
1193 |
int[] indices = e.getIndices(); |
| 1185 |
for (int i = 0; i < indices.length; i++) { |
1194 |
for (int i = 0; i < indices.length; i++) { |
| 1186 |
curC = toComp(container.getModel().getTab(indices[i])); |
1195 |
curC = toComp(container.getModel().getTab(indices[i])); |
|
|
1196 |
if (curC.getParent() != null) { |
| 1197 |
curC.getParent().remove(curC); |
| 1198 |
} |
| 1187 |
contentDisplayer.add(curC, ""); |
1199 |
contentDisplayer.add(curC, ""); |
| 1188 |
} |
1200 |
} |
| 1189 |
} |
1201 |
} |
|
Lines 1260-1266
Link Here
|
| 1260 |
//extra work |
1272 |
//extra work |
| 1261 |
if (!contentDisplayer.isAncestorOf( |
1273 |
if (!contentDisplayer.isAncestorOf( |
| 1262 |
toComp(add))) { |
1274 |
toComp(add))) { |
| 1263 |
contentDisplayer.add(toComp(add), ""); |
1275 |
Component curC = toComp(add); |
|
|
1276 |
if (curC.getParent() != null) { |
| 1277 |
curC.getParent().remove(curC); |
| 1278 |
} |
| 1279 |
contentDisplayer.add(curC, ""); |
| 1264 |
changed = true; |
1280 |
changed = true; |
| 1265 |
} |
1281 |
} |
| 1266 |
} |
1282 |
} |