Skip to content

Commit 754e201

Browse files
VWoeltjenVWoeltjen
committed
[Tests] Merge test update with latest from master
Resolved conflicts: * Fix for intermittent test failure in TestPlotView had been implemented in separate branches; accepted most-commented version of the fix. * Swing thread usage had been added on one branch for TestPlotViewRole, and TestNG data provider usage had been added on another. Merged both approaches.
2 parents d0bc5a8 + 87330eb commit 754e201

File tree

174 files changed

+7760
-1620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+7760
-1620
lines changed

‎ImportExportProvider/src/main/java/gov/nasa/arc/mct/importExport/provider/ImportExportProvider.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
import java.util.List;
3434
import java.util.ResourceBundle;
3535

36-
import javax.swing.ImageIcon;
37-
3836
/**
3937
* The <code>ImportExportProvider</code> provides menu items to import data into a
4038
* taxonomy node to the MCT directory and export data from a node.
@@ -54,9 +52,7 @@ public ImportExportProvider() {
5452
* EventsCollection.class, false),
5553
*/
5654
new ComponentTypeInfo(bundle.getString("display_name"), bundle
57-
.getString("description"), ImportExportComponent.class, false,
58-
new ImageIcon(ImportExportComponent.class
59-
.getResource("/icons/legacyCollection.png"))));
55+
.getString("description"), ImportExportComponent.class, false));
6056

6157
assert componentTypes != null;
6258
}

‎Plotter/src/test/java/plotter/xy/JUnitXYPlotLine.java

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public class JUnitXYPlotLine extends TestCase {
1212
private XYPlotLine line;
1313

1414

15+
@SuppressWarnings("serial")//Harleigh108: this removes the warning received when we build with respect to java 7:for XYPlotLine
1516
protected void setUp() {
1617
line = new XYPlotLine() {
1718
@Override

‎README.md

+4
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ Working on MCT
1717
[Building a MySQL database](https://github.com/nasa/mct/wiki/Creating-a-MySQL-database-for-MCT)
1818

1919
[Using a Derby database](https://github.com/nasa/mct/wiki/Using-Derby-in-MCT)
20+
21+
[Using a Derby database](https://github.com/nasa/mct/wiki/Using-Derby-in-MCT)
22+
23+
[Contributing to MCT](https://github.com/nasa/mct/wiki/Contributing-to-MCT)

‎canvas/src/main/java/gov/nasa/arc/mct/canvas/panel/TransferableIcon.java

+29-24
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,31 @@
2121
*******************************************************************************/
2222
package gov.nasa.arc.mct.canvas.panel;
2323

24-
import gov.nasa.arc.mct.components.AbstractComponent;
25-
import gov.nasa.arc.mct.gui.View;
26-
import gov.nasa.arc.mct.gui.ViewRoleSelection;
27-
import gov.nasa.arc.mct.platform.spi.Platform;
28-
import gov.nasa.arc.mct.platform.spi.PlatformAccess;
29-
import gov.nasa.arc.mct.policy.ExecutionResult;
30-
import gov.nasa.arc.mct.policy.PolicyContext;
31-
import gov.nasa.arc.mct.policy.PolicyInfo;
32-
import gov.nasa.arc.mct.services.component.PolicyManager;
33-
34-
import java.awt.Container;
35-
import java.awt.datatransfer.Transferable;
36-
import java.awt.event.MouseAdapter;
37-
import java.awt.event.MouseEvent;
38-
import java.awt.event.MouseMotionAdapter;
39-
import java.util.Collections;
40-
import java.util.List;
41-
import java.util.concurrent.atomic.AtomicBoolean;
42-
43-
import javax.swing.JComponent;
44-
import javax.swing.JLabel;
45-
import javax.swing.TransferHandler;
24+
import gov.nasa.arc.mct.components.AbstractComponent;
25+
import gov.nasa.arc.mct.gui.View;
26+
import gov.nasa.arc.mct.gui.ViewRoleSelection;
27+
import gov.nasa.arc.mct.platform.spi.Platform;
28+
import gov.nasa.arc.mct.platform.spi.PlatformAccess;
29+
import gov.nasa.arc.mct.policy.ExecutionResult;
30+
import gov.nasa.arc.mct.policy.PolicyContext;
31+
import gov.nasa.arc.mct.policy.PolicyInfo;
32+
import gov.nasa.arc.mct.services.component.PolicyManager;
33+
import gov.nasa.arc.mct.util.MCTIcons;
34+
35+
import java.awt.Color;
36+
import java.awt.Container;
37+
import java.awt.datatransfer.Transferable;
38+
import java.awt.event.MouseAdapter;
39+
import java.awt.event.MouseEvent;
40+
import java.awt.event.MouseMotionAdapter;
41+
import java.util.Collections;
42+
import java.util.List;
43+
import java.util.concurrent.atomic.AtomicBoolean;
44+
45+
import javax.swing.ImageIcon;
46+
import javax.swing.JComponent;
47+
import javax.swing.JLabel;
48+
import javax.swing.TransferHandler;
4649

4750
/**
4851
* This class provides an icon view that supports the transferable protocol required for drag and drop. Instances of this
@@ -52,7 +55,9 @@
5255
*/
5356
public class TransferableIcon extends JLabel {
5457
private static final long serialVersionUID = -7380332900682920418L;
55-
58+
private static final Color ICON_COLOR = new Color(130,130,130);
59+
60+
5661
/**
5762
* This method creates a new Transferable Icon.
5863
* @param referencedComponent component that is currently active in the view.
@@ -61,7 +66,7 @@ public class TransferableIcon extends JLabel {
6166
*/
6267
@SuppressWarnings("serial")
6368
public TransferableIcon(final AbstractComponent referencedComponent, final ViewTransferCallback viewTransferCallback) {
64-
super(referencedComponent.getIcon());
69+
super(MCTIcons.processIcon(referencedComponent.getAsset(ImageIcon.class), ICON_COLOR, false));
6570
final AtomicBoolean clicked = new AtomicBoolean(false);
6671
setTransferHandler(new TransferHandler() {
6772
@Override

‎canvas/src/main/java/gov/nasa/arc/mct/canvas/provider/CanvasComponentProvider.java

+61-51
Original file line numberDiff line numberDiff line change
@@ -21,67 +21,68 @@
2121
*******************************************************************************/
2222
package gov.nasa.arc.mct.canvas.provider;
2323

24-
import gov.nasa.arc.mct.canvas.policy.CanvasFilterViewPolicy;
25-
import gov.nasa.arc.mct.canvas.policy.EmbeddedCanvasViewsAreNotWriteable;
26-
import gov.nasa.arc.mct.canvas.view.CanvasManifestation;
27-
import gov.nasa.arc.mct.canvas.view.ChangeGridSizeAction;
28-
import gov.nasa.arc.mct.canvas.view.ChangeSnapAction;
29-
import gov.nasa.arc.mct.canvas.view.PanelInspector;
30-
import gov.nasa.arc.mct.canvas.view.ReTileAction;
31-
import gov.nasa.arc.mct.canvas.view.WindowChangeGridSizeAction;
32-
import gov.nasa.arc.mct.canvas.view.WindowChangeSnapAction;
33-
import gov.nasa.arc.mct.canvas.view.WindowReTileAction;
34-
import gov.nasa.arc.mct.gui.MenuItemInfo;
24+
import gov.nasa.arc.mct.canvas.policy.CanvasFilterViewPolicy;
25+
import gov.nasa.arc.mct.canvas.policy.EmbeddedCanvasViewsAreNotWriteable;
26+
import gov.nasa.arc.mct.canvas.view.CanvasManifestation;
27+
import gov.nasa.arc.mct.canvas.view.ChangeGridSizeAction;
28+
import gov.nasa.arc.mct.canvas.view.ChangeSnapAction;
29+
import gov.nasa.arc.mct.canvas.view.PanelInspector;
30+
import gov.nasa.arc.mct.canvas.view.ReTileAction;
31+
import gov.nasa.arc.mct.canvas.view.WindowChangeGridSizeAction;
32+
import gov.nasa.arc.mct.canvas.view.WindowChangeSnapAction;
33+
import gov.nasa.arc.mct.canvas.view.WindowReTileAction;
34+
import gov.nasa.arc.mct.gui.MenuItemInfo;
3535
import gov.nasa.arc.mct.gui.MenuItemInfo.MenuItemType;
36-
import gov.nasa.arc.mct.menu.AlignBottomAction;
37-
import gov.nasa.arc.mct.menu.AlignHorizontalCenterAction;
38-
import gov.nasa.arc.mct.menu.AlignLeftAction;
39-
import gov.nasa.arc.mct.menu.AlignRightAction;
40-
import gov.nasa.arc.mct.menu.AlignTopAction;
41-
import gov.nasa.arc.mct.menu.AlignVerticalCenterAction;
42-
import gov.nasa.arc.mct.menu.AlignmentMenu;
43-
import gov.nasa.arc.mct.menu.BorderStylesAction;
44-
import gov.nasa.arc.mct.menu.BorderStylesMenu;
45-
import gov.nasa.arc.mct.menu.BordersAllOrNoneAction;
46-
import gov.nasa.arc.mct.menu.BordersBottomAction;
47-
import gov.nasa.arc.mct.menu.BordersLeftAction;
48-
import gov.nasa.arc.mct.menu.BordersMenu;
49-
import gov.nasa.arc.mct.menu.BordersRightAction;
50-
import gov.nasa.arc.mct.menu.BordersTopAction;
51-
import gov.nasa.arc.mct.menu.BringToFrontAction;
36+
import gov.nasa.arc.mct.menu.AlignBottomAction;
37+
import gov.nasa.arc.mct.menu.AlignHorizontalCenterAction;
38+
import gov.nasa.arc.mct.menu.AlignLeftAction;
39+
import gov.nasa.arc.mct.menu.AlignRightAction;
40+
import gov.nasa.arc.mct.menu.AlignTopAction;
41+
import gov.nasa.arc.mct.menu.AlignVerticalCenterAction;
42+
import gov.nasa.arc.mct.menu.AlignmentMenu;
43+
import gov.nasa.arc.mct.menu.BorderStylesAction;
44+
import gov.nasa.arc.mct.menu.BorderStylesMenu;
45+
import gov.nasa.arc.mct.menu.BordersAllOrNoneAction;
46+
import gov.nasa.arc.mct.menu.BordersBottomAction;
47+
import gov.nasa.arc.mct.menu.BordersLeftAction;
48+
import gov.nasa.arc.mct.menu.BordersMenu;
49+
import gov.nasa.arc.mct.menu.BordersRightAction;
50+
import gov.nasa.arc.mct.menu.BordersTopAction;
51+
import gov.nasa.arc.mct.menu.BringToFrontAction;
5252
import gov.nasa.arc.mct.menu.ChangeViewAction;
53-
import gov.nasa.arc.mct.menu.ExportPanelAsImageAction;
54-
import gov.nasa.arc.mct.menu.GridMenu;
55-
import gov.nasa.arc.mct.menu.PanelTitleBarAction;
56-
import gov.nasa.arc.mct.menu.RemovePanelAction;
57-
import gov.nasa.arc.mct.menu.SelectAllAction;
58-
import gov.nasa.arc.mct.menu.SendToBackAction;
59-
import gov.nasa.arc.mct.menu.WindowGridMenu;
60-
import gov.nasa.arc.mct.policy.PolicyInfo;
61-
import gov.nasa.arc.mct.services.component.AbstractComponentProvider;
62-
import gov.nasa.arc.mct.services.component.ViewInfo;
63-
import gov.nasa.arc.mct.services.component.ViewType;
64-
65-
import java.util.Arrays;
66-
import java.util.Collection;
67-
import java.util.ResourceBundle;
68-
69-
import javax.swing.ImageIcon;
53+
import gov.nasa.arc.mct.menu.ExportPanelAsImageAction;
54+
import gov.nasa.arc.mct.menu.GridMenu;
55+
import gov.nasa.arc.mct.menu.PanelTitleBarAction;
56+
import gov.nasa.arc.mct.menu.RemovePanelAction;
57+
import gov.nasa.arc.mct.menu.SelectAllAction;
58+
import gov.nasa.arc.mct.menu.SendToBackAction;
59+
import gov.nasa.arc.mct.menu.WindowGridMenu;
60+
import gov.nasa.arc.mct.policy.PolicyInfo;
61+
import gov.nasa.arc.mct.services.component.AbstractComponentProvider;
62+
import gov.nasa.arc.mct.services.component.TypeInfo;
63+
import gov.nasa.arc.mct.services.component.ViewInfo;
64+
import gov.nasa.arc.mct.services.component.ViewType;
65+
66+
import java.util.Arrays;
67+
import java.util.Collection;
68+
import java.util.ResourceBundle;
69+
70+
import javax.swing.ImageIcon;
7071

7172
public class CanvasComponentProvider extends AbstractComponentProvider {
72-
private static ResourceBundle bundle = ResourceBundle.getBundle("CanvasResourceBundle");
73+
private static ResourceBundle bundle = ResourceBundle.getBundle("CanvasResourceBundle");
74+
75+
private static final ImageIcon ICON =
76+
new ImageIcon(CanvasComponentProvider.class.getResource("/icons/mct_icon_menu_canvas.png"));
77+
7378
private static final Collection<ViewInfo> VIEW_INFOS =
7479
Arrays.asList(
7580
new ViewInfo(CanvasManifestation.class, bundle.getString("Canvas"), "gov.nasa.arc.mct.canvas.view.CanvasView",
76-
ViewType.OBJECT,
77-
new ImageIcon(CanvasComponentProvider.class.getResource("/images/canvasViewButton-OFF.png")),
78-
new ImageIcon(CanvasComponentProvider.class.getResource("/images/canvasViewButton-ON.png"))),
81+
ViewType.OBJECT),
7982
new ViewInfo(CanvasManifestation.class, bundle.getString("Canvas"), "gov.nasa.arc.mct.canvas.view.CanvasView",
8083
ViewType.CENTER),
8184
new ViewInfo(CanvasManifestation.class, bundle.getString("Canvas"), "gov.nasa.arc.mct.canvas.view.CanvasView",
82-
ViewType.EMBEDDED,
83-
new ImageIcon(CanvasComponentProvider.class.getResource("/images/canvasViewButton-OFF.png")),
84-
new ImageIcon(CanvasComponentProvider.class.getResource("/images/canvasViewButton-ON.png"))),
85+
ViewType.EMBEDDED),
8586
new ViewInfo(PanelInspector.class, "Panel Inspector", ViewType.CENTER_OWNED_INSPECTOR));
8687
@Override
8788
public Collection<MenuItemInfo> getMenuItemInfos() {
@@ -203,5 +204,14 @@ public Collection<PolicyInfo> getPolicyInfos() {
203204
@Override
204205
public Collection<ViewInfo> getViews(String componentTypeId) {
205206
return VIEW_INFOS;
207+
}
208+
209+
@Override
210+
public <T> T getAsset(TypeInfo<?> typeInfo, Class<T> assetClass) {
211+
if (assetClass.isAssignableFrom(ImageIcon.class) &&
212+
typeInfo.getTypeClass().equals(CanvasManifestation.class)) {
213+
return assetClass.cast(ICON);
214+
}
215+
return super.getAsset(typeInfo, assetClass);
206216
}
207217
}

0 commit comments

Comments
 (0)