-
Notifications
You must be signed in to change notification settings - Fork 982
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
upstream merge from 'develop' into 'feature/#73/ibmj9'
- Loading branch information
Showing
43 changed files
with
1,168 additions
and
1,044 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,9 +7,6 @@ | |
|
||
/** | ||
* AutoCompletionComboBox. | ||
* <p/> | ||
* Date: Oct 6, 2005 | ||
* Time: 1:16:42 PM | ||
* | ||
* @author <a href="mailto:[email protected]">Hendrik Schreiber</a> | ||
*/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,9 +14,6 @@ | |
|
||
/** | ||
* AutoCompletionTextField. | ||
* <p/> | ||
* Date: Oct 6, 2005 | ||
* Time: 9:49:21 AM | ||
* | ||
* @author <a href="mailto:[email protected]">Hendrik Schreiber</a> | ||
*/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,15 +36,13 @@ | |
* for layouting. | ||
* | ||
* @author <a href="mailto:[email protected]">Hendrik Schreiber</a> | ||
* <p>Date: May 5, 2005<br/> | ||
* Time: 2:14:36 PM</p> | ||
*/ | ||
public class ChartPanelView { | ||
|
||
public static final String EVENT_MINIMIZED = "minimized"; | ||
|
||
private GCPreferences preferences; | ||
|
||
private ModelChartImpl modelChart; | ||
private ModelPanel modelPanel; | ||
private ModelDetailsPanel modelDetailsPanel; | ||
|
@@ -57,27 +55,27 @@ public class ChartPanelView { | |
private GCDocument gcDocument; | ||
private TextAreaLogHandler textAreaLogHandler; | ||
private DataReaderFacade dataReaderFacade; | ||
|
||
public ChartPanelView(GCDocument gcDocument, URL url) throws DataReaderException { | ||
this.gcDocument = gcDocument; | ||
this.preferences = gcDocument.getPreferences(); | ||
this.modelChart = new ModelChartImpl(); | ||
this.modelPanel = new ModelPanel(); | ||
this.modelDetailsPanel = new ModelDetailsPanel(); | ||
JScrollPane modelDetailsScrollPane = new JScrollPane(modelDetailsPanel, | ||
JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, | ||
|
||
JScrollPane modelDetailsScrollPane = new JScrollPane(modelDetailsPanel, | ||
JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, | ||
JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); | ||
|
||
JScrollBar hScrollBar = modelDetailsScrollPane.getHorizontalScrollBar(); | ||
hScrollBar.setUnitIncrement(10); | ||
JScrollBar vScrollBar = modelDetailsScrollPane.getVerticalScrollBar(); | ||
vScrollBar.setUnitIncrement(10); | ||
|
||
this.modelChartAndDetailsPanel = new JTabbedPane(); | ||
this.modelChartAndDetailsPanel.addTab(LocalisationHelper.getString("data_panel_tab_chart"), modelChart); | ||
this.modelChartAndDetailsPanel.addTab(LocalisationHelper.getString("data_panel_tab_details"), modelDetailsScrollPane); | ||
|
||
this.viewBar = new ViewBar(this); | ||
this.propertyChangeSupport = new SwingPropertyChangeSupport(this); | ||
this.textAreaLogHandler = new TextAreaLogHandler(); | ||
|
@@ -91,7 +89,7 @@ public ChartPanelView(GCDocument gcDocument, URL url) throws DataReaderException | |
/** | ||
* Reloads the model displayed in this chart panel if it has changed. Using the parameter | ||
* the parser error dialog can be suppressed. | ||
* | ||
* | ||
* @param showParserErrors if <code>true</code> parser errors will be shown | ||
* @return <code>true</code>, if the file has been reloaded | ||
* @throws DataReaderException if something went wrong reading the file | ||
|
@@ -146,7 +144,7 @@ public void setMinimized(boolean minimized) { | |
public JTabbedPane getModelChartAndDetails() { | ||
return modelChartAndDetailsPanel; | ||
} | ||
|
||
public ModelChart getModelChart() { | ||
return modelChart; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,9 +26,6 @@ | |
|
||
/** | ||
* DesktopPane is the "background" of the application after opening. | ||
* <p/> | ||
* Date: Sep 27, 2005 | ||
* Time: 9:41:33 AM | ||
* | ||
* @author <a href="mailto:[email protected]">Hendrik Schreiber</a> | ||
*/ | ||
|
@@ -78,42 +75,42 @@ public void drop(DropTargetDropEvent e) { | |
} | ||
|
||
private ImageIcon logoIcon = new ImageIcon(GCViewerGui.class.getResource("gcviewer_background.png")); | ||
|
||
public void paint(Graphics g) { | ||
fillBackground(g); | ||
|
||
// draw logo | ||
g.drawImage(logoIcon.getImage(), | ||
getWidth()/2 - logoIcon.getIconWidth()/2, | ||
getHeight()/2 - logoIcon.getIconHeight()/2, | ||
logoIcon.getIconWidth(), | ||
logoIcon.getIconHeight(), | ||
g.drawImage(logoIcon.getImage(), | ||
getWidth()/2 - logoIcon.getIconWidth()/2, | ||
getHeight()/2 - logoIcon.getIconHeight()/2, | ||
logoIcon.getIconWidth(), | ||
logoIcon.getIconHeight(), | ||
logoIcon.getImageObserver()); | ||
|
||
drawVersionString(g, logoIcon); | ||
|
||
super.paint(g); | ||
} | ||
|
||
/** | ||
* Adds version string below <code>logoImage</code>. | ||
* | ||
* | ||
* @param g | ||
*/ | ||
private void drawVersionString(Graphics g, ImageIcon logoImage) { | ||
g.setColor(Color.LIGHT_GRAY); | ||
g.setFont(new Font("Serif", Font.BOLD, 12)); | ||
|
||
// use anti aliasing to draw string | ||
Graphics2D g2d = (Graphics2D)g; | ||
Object oldAAHint = g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING); | ||
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); | ||
|
||
String versionString = "version: " + BuildInfoReader.getVersion() + " (" + BuildInfoReader.getBuildDate() + ")"; | ||
g.drawString(versionString, | ||
g.drawString(versionString, | ||
getWidth()/2 - g.getFontMetrics().stringWidth(versionString)/2, | ||
getHeight()/2 + logoImage.getIconHeight()/2 + 25); | ||
|
||
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, oldAAHint); | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -37,9 +37,9 @@ | |
import com.tagtraum.perf.gcviewer.imp.DataReaderException; | ||
|
||
/** | ||
* GCDocument. | ||
* | ||
* @author <a href="mailto:[email protected]">Hendrik Schreiber</a> | ||
* Date: May 5, 2005 | ||
* Time: 10:25:16 AM | ||
*/ | ||
public class GCDocument extends JInternalFrame { | ||
|
||
|
@@ -121,7 +121,10 @@ public void setShowModelPanel(boolean showModelPanel) { | |
} | ||
|
||
/** | ||
* Reload Models. | ||
* | ||
* @return true, if any of the files has been reloaded | ||
* @param background true if relayout should be skipped. | ||
* @throws DataReaderException if something went wrong reading the data | ||
*/ | ||
public boolean reloadModels(boolean background) throws DataReaderException { | ||
|
@@ -142,7 +145,7 @@ public ModelChart getModelChart() { | |
public GCPreferences getPreferences() { | ||
return preferences; | ||
} | ||
|
||
public void add(final URL url) throws DataReaderException { | ||
ChartPanelView chartPanelView = new ChartPanelView(this, url); | ||
chartPanelViews.add(chartPanelView); | ||
|
@@ -612,19 +615,16 @@ public void stateChanged(ChangeEvent e) { | |
} | ||
|
||
} | ||
|
||
/** | ||
* | ||
* | ||
* @author <a href="mailto:[email protected]">Joerg Wuethrich</a> | ||
* <p>created on: 22.07.2012</p> | ||
*/ | ||
private class ResizeListener extends ComponentAdapter { | ||
|
||
@Override | ||
public void componentResized(ComponentEvent e) { | ||
modelChartListFacade.resetPolygonCache(); | ||
} | ||
|
||
} | ||
} |
Oops, something went wrong.