Skip to content

Commit

Permalink
completely remove ui.jar. Remake UI creation with pure swing/awt comp…
Browse files Browse the repository at this point in the history
…onents
  • Loading branch information
Sukhotin Mikhail committed May 1, 2013
1 parent 8ac2a9a commit 15f723c
Show file tree
Hide file tree
Showing 8 changed files with 333 additions and 910 deletions.
Binary file removed canmonitor/lib/ui.jar
Binary file not shown.
126 changes: 58 additions & 68 deletions canmonitor/src/ocera/rtcan/monitor/CANopenDevicePanel.java
@@ -1,8 +1,8 @@
package ocera.rtcan.monitor;

import com.intellij.uiDesigner.core.GridConstraints;
import com.intellij.uiDesigner.core.GridLayoutManager;
import com.intellij.uiDesigner.core.Spacer;
//import com.intellij.uiDesigner.core.GridConstraints;
//import com.intellij.uiDesigner.core.GridLayoutManager;
//import com.intellij.uiDesigner.core.Spacer;
import ocera.rtcan.eds.EdsNode;
import ocera.rtcan.eds.EdsAttribute;
import ocera.rtcan.CanOpen.ODNode;
Expand Down Expand Up @@ -120,7 +120,7 @@ public CANopenDevicePanel(CanMonitor mainapp, int tab_index) {
if (mainapp == null) throw new NullPointerException("CANopenDevicePanel(): mainapp is NULL.");
mainApp = mainapp;
tabIndex = tab_index;

createUI();
init();
initGui();
}
Expand Down Expand Up @@ -520,95 +520,85 @@ public boolean tasteObject(Object o) {
return true;
}

{
// GUI initializer generated by IntelliJ IDEA GUI Designer
// >>> IMPORTANT!! <<<
// DO NOT EDIT OR ADD ANY CODE HERE!
$$$setupUI$$$();
}

/**
* Method generated by IntelliJ IDEA GUI Designer
* >>> IMPORTANT!! <<<
* DO NOT edit this method OR call it in your code!
*
* @noinspection ALL
*/
private void $$$setupUI$$$() {
private void createUI() {
pane = new JTabbedPane();
pane.setTabLayoutPolicy(0);
pane.setTabPlacement(3);
final JPanel panel1 = new JPanel();
panel1.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
pane.addTab("OD", panel1);
final JSplitPane splitPane1 = new JSplitPane();
splitPane1.setDividerLocation(164);
splitPane1.setDividerSize(8);
panel1.add(splitPane1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, new Dimension(200, 200), null, 0, false));
final JPanel panel2 = new JPanel();
panel2.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
splitPane1.setRightComponent(panel2);
final JPanel panel3 = new JPanel();
panel3.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 0, 0), -1, -1));
panel2.add(panel3, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
final JPanel panel4 = new JPanel();
panel4.setLayout(new GridLayoutManager(1, 6, new Insets(2, 3, 0, 3), 5, -1));
panel3.add(panel4, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));

final JPanel odPanel = new JPanel();
odPanel.setLayout(new GridLayout(1, 1));
pane.addTab("OD", odPanel);
final JSplitPane splitPane = new JSplitPane();
splitPane.setDividerLocation(164);
splitPane.setDividerSize(8);
odPanel.add(splitPane);

final JPanel rightPanel = new JPanel();
rightPanel.setLayout(new BorderLayout());
splitPane.setRightComponent(rightPanel);

final JPanel rightToolPanel = new JPanel();
rightToolPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
rightPanel.add(rightToolPanel, BorderLayout.PAGE_START);

edSDO = new JTextField();
panel4.add(edSDO, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
edSDO.setPreferredSize(new Dimension(150, 30));
rightToolPanel.add(edSDO);

btUploadSDO = new JButton();
btUploadSDO.setMargin(new Insets(2, 5, 2, 5));
btUploadSDO.setText("Upload");
btUploadSDO.setMnemonic('U');
btUploadSDO.setDisplayedMnemonicIndex(0);
panel4.add(btUploadSDO, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
rightToolPanel.add(btUploadSDO);

btDownloadSDO = new JButton();
btDownloadSDO.setMargin(new Insets(2, 5, 2, 5));
btDownloadSDO.setText("Download");
btDownloadSDO.setMnemonic('D');
btDownloadSDO.setDisplayedMnemonicIndex(0);
panel4.add(btDownloadSDO, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
rightToolPanel.add(btDownloadSDO);

representationComboBox = new JComboBox();
rightToolPanel.add(representationComboBox);

final JLabel label1 = new JLabel();
label1.setText("node");
panel4.add(label1, new GridConstraints(0, 4, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
rightToolPanel.add(label1);

edNodeID = new JTextField();
panel4.add(edNodeID, new GridConstraints(0, 5, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(20, -1), null, 0, false));
representationComboBox = new JComboBox();
panel4.add(representationComboBox, new GridConstraints(0, 3, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final JScrollPane scrollPane1 = new JScrollPane();
panel3.add(scrollPane1, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
rightToolPanel.add(edNodeID);


final JScrollPane tableScrollPane = new JScrollPane();
rightPanel.add(tableScrollPane, BorderLayout.CENTER);
tblProp = new JTable();
scrollPane1.setViewportView(tblProp);
final JScrollPane scrollPane2 = new JScrollPane();
splitPane1.setLeftComponent(scrollPane2);
tableScrollPane.setViewportView(tblProp);


final JScrollPane treeScrollPane = new JScrollPane();
splitPane.setLeftComponent(treeScrollPane);
treeEds = new JTree();
scrollPane2.setViewportView(treeEds);
final JPanel panel5 = new JPanel();
panel5.setLayout(new GridLayoutManager(1, 1, new Insets(3, 5, 3, 5), -1, -1));
pane.addTab("Log", panel5);
final JPanel panel6 = new JPanel();
panel6.setLayout(new GridLayoutManager(2, 1, new Insets(0, 0, 0, 0), -1, -1));
panel5.add(panel6, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
final JScrollPane scrollPane3 = new JScrollPane();
panel6.add(scrollPane3, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
treeScrollPane.setViewportView(treeEds);

final JPanel logPanel = new JPanel();
logPanel.setLayout(new BorderLayout());
pane.addTab("Log", logPanel);

final JScrollPane logScrollPane = new JScrollPane();
logPanel.add(logScrollPane, BorderLayout.CENTER);
txtLog = new JTextArea();
scrollPane3.setViewportView(txtLog);
final JPanel panel7 = new JPanel();
panel7.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1));
panel6.add(panel7, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
logScrollPane.setViewportView(txtLog);

final JPanel clearButtonPane = new JPanel();
clearButtonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
logPanel.add(clearButtonPane, BorderLayout.PAGE_END);
btClearLog = new JButton();
btClearLog.setText("Clear");
btClearLog.setMnemonic('C');
btClearLog.setDisplayedMnemonicIndex(0);
panel7.add(btClearLog, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final Spacer spacer1 = new Spacer();
panel7.add(spacer1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_WANT_GROW, 1, null, null, null, 0, false));
clearButtonPane.add(btClearLog);
}

/**
* @noinspection ALL
*/
public JComponent $$$getRootComponent$$$() {
return pane;
}
}
83 changes: 38 additions & 45 deletions canmonitor/src/ocera/rtcan/monitor/CanMonStatusBar.java
@@ -1,79 +1,72 @@
package ocera.rtcan.monitor;

import com.intellij.uiDesigner.core.GridConstraints;
import com.intellij.uiDesigner.core.GridLayoutManager;

import javax.swing.*;
import java.awt.*;

/**
* Created by IntelliJ IDEA.
* User: fanda
* Date: Feb 19, 2004
* Time: 2:29:30 PM
* To change this template use File | Settings | File Templates.
*/
public class CanMonStatusBar {
public JLabel lbl1;
public JLabel lbl2;
public JLabel lbl3;
public JPanel panel;
public JPanel mainPanel;

{
// GUI initializer generated by IntelliJ IDEA GUI Designer
// >>> IMPORTANT!! <<<
// DO NOT EDIT OR ADD ANY CODE HERE!
$$$setupUI$$$();
}
public CanMonStatusBar() {
mainPanel = new JPanel();

/**
* Method generated by IntelliJ IDEA GUI Designer
* >>> IMPORTANT!! <<<
* DO NOT edit this method OR call it in your code!
*
* @noinspection ALL
*/
private void $$$setupUI$$$() {
panel = new JPanel();
panel.setLayout(new GridLayoutManager(1, 3, new Insets(1, 0, 0, 0), 5, 0));
panel.setEnabled(false);
final JPanel panel1 = new JPanel();
panel1.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, 0));
panel.add(panel1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
GridBagLayout gbl = new GridBagLayout();
mainPanel.setLayout(gbl);
mainPanel.setEnabled(false);

final JPanel panel1 = new JPanel(new FlowLayout(FlowLayout.LEFT));
panel1.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), null));
lbl1 = new JLabel();
lbl1.setIconTextGap(0);
lbl1.setText("ahoj");
lbl1.setVerticalAlignment(1);
lbl1.setVerticalTextPosition(1);
panel1.add(lbl1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
panel1.add(lbl1);


GridBagConstraints c = new GridBagConstraints();
c.anchor = GridBagConstraints.WEST;
c.fill = GridBagConstraints.BOTH;
c.gridheight = 1;
c.gridwidth = 3;
c.gridx = GridBagConstraints.RELATIVE;
c.gridy = 1;
c.insets = new Insets(0, 8, 8, 0);
c.ipadx = 0;
c.ipady = 0;
c.weightx = 0.9;
c.weighty = 0.0;
gbl.setConstraints(panel1, c);
mainPanel.add(panel1);

final JPanel panel2 = new JPanel();
panel2.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, 0));
panel.add(panel2, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(50, -1), null, 0, false));
panel2.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), null));
lbl2 = new JLabel();
lbl2.setIconTextGap(0);
lbl2.setText("lbl2");
lbl2.setVerticalAlignment(1);
lbl2.setVerticalTextPosition(1);
panel2.add(lbl2, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
panel2.add(lbl2);
c.weightx = 0.05;
c.insets = new Insets(0, 4, 8, 0);
gbl.setConstraints(panel2, c);
mainPanel.add(panel2);

final JPanel panel3 = new JPanel();
panel3.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, 0));
panel.add(panel3, new GridConstraints(0, 2, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(50, -1), null, 0, false));
panel3.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), null));
lbl3 = new JLabel();
lbl3.setHorizontalTextPosition(2);
lbl3.setIconTextGap(0);
lbl3.setText("lbl3");
lbl3.setVerticalAlignment(1);
lbl3.setVerticalTextPosition(1);
panel3.add(lbl3, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
}
panel3.add(lbl3);
c.weightx = 0.05;
c.insets = new Insets(0, 4, 8, 8);
gbl.setConstraints(panel3, c);

/**
* @noinspection ALL
*/
public JComponent $$$getRootComponent$$$() {
return panel;
mainPanel.add(panel3);
}
}
}

0 comments on commit 15f723c

Please sign in to comment.