.. | .. |
---|
35 | 35 | public JMenu filterMenu; |
---|
36 | 36 | JMenuItem save = new JMenuItem("Save"); |
---|
37 | 37 | FilterControlPanel filterControlPanel; |
---|
38 | | - LinkTabPane leftPanel; |
---|
| 38 | + //LinkTabPane |
---|
| 39 | + JTabbedPane leftPanel; |
---|
39 | 40 | TFListener filterMenuMaker = new TFListener() |
---|
40 | 41 | { |
---|
41 | 42 | @Override |
---|
.. | .. |
---|
90 | 91 | |
---|
91 | 92 | // left tab area, with vertical gray divider. |
---|
92 | 93 | JPanel leftHolder = new JPanel(); |
---|
93 | | - container.add(leftHolder, BorderLayout.WEST); |
---|
| 94 | + container.add(leftHolder, BorderLayout.EAST); // WEST); |
---|
94 | 95 | |
---|
95 | 96 | leftHolder.setLayout(new BorderLayout()); |
---|
96 | 97 | JPanel pad = new Pad(3, 3); |
---|
97 | 98 | pad.setBackground(Color.gray); |
---|
98 | 99 | leftHolder.add(pad, BorderLayout.EAST); |
---|
99 | 100 | |
---|
100 | | - leftPanel = new LinkTabPane();//JTabbedPane(); |
---|
| 101 | + leftPanel = new //LinkTabPane(); |
---|
| 102 | + JTabbedPane(); |
---|
101 | 103 | leftHolder.add(leftPanel, BorderLayout.CENTER); |
---|
102 | 104 | |
---|
103 | 105 | JPanel configPanel = new JPanel(); |
---|
.. | .. |
---|
112 | 114 | configPanel.add(legend, BorderLayout.CENTER); |
---|
113 | 115 | legend.add(new SizeLegendPanel(model), BorderLayout.NORTH); |
---|
114 | 116 | legend.add(new ColorLegendPanel(model), BorderLayout.CENTER); |
---|
115 | | - leftPanel.addTab(configPanel, "Display", true); |
---|
| 117 | + leftPanel.add(configPanel, "Display"); //, true); |
---|
116 | 118 | |
---|
117 | | - leftPanel.addTab(filterControlPanel, "Filter", true); |
---|
| 119 | + leftPanel.add(filterControlPanel, "Filter"); //, true); |
---|
118 | 120 | |
---|
119 | 121 | // center tab area |
---|
120 | 122 | |
---|
.. | .. |
---|
135 | 137 | AbstractView[] views = |
---|
136 | 138 | { |
---|
137 | 139 | timeline, |
---|
138 | | - new CalendarView(model), |
---|
| 140 | + //new CalendarView(model), |
---|
139 | 141 | new ListView(model), |
---|
140 | 142 | new TableView(model), |
---|
141 | 143 | new BarGraphView(model), |
---|
142 | | - intro, |
---|
143 | | - new DescriptionView(model), |
---|
| 144 | + //intro, |
---|
144 | 145 | new SummaryView(model), |
---|
| 146 | + new DescriptionView(model), |
---|
145 | 147 | }; |
---|
146 | 148 | |
---|
147 | 149 | for (int i = 0; i < views.length; i++) |
---|
148 | 150 | { |
---|
149 | | - center.addTab(views[i], views[i].getName(), i < 5); |
---|
| 151 | + center.addTab(views[i], views[i].getName(), true); // i < 5); |
---|
150 | 152 | displayPanel.addLocalControl(views[i].getName(), views[i].getControls()); |
---|
151 | 153 | } |
---|
152 | 154 | |
---|