Skip to content
This repository was archived by the owner on May 27, 2024. It is now read-only.

Commit 7024c50

Browse files
tenzaptenzap
committed
ReportViewer: Route: add warning that stops must be added before updating routes
1 parent 6736d79 commit 7024c50

File tree

2 files changed

+124
-0
lines changed

2 files changed

+124
-0
lines changed

‎GO_Sync/src/main/java/edu/usf/cutr/go_sync/gui/ReportViewer.form

+110
Original file line numberDiff line numberDiff line change
@@ -4017,6 +4017,21 @@
40174017
</Constraint>
40184018
</Constraints>
40194019
</Component>
4020+
<Component class="javax.swing.JLabel" name="membersWarningLabel">
4021+
<Properties>
4022+
<Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
4023+
<Color blue="ff" green="0" id="magenta" palette="1" red="ff" type="palette"/>
4024+
</Property>
4025+
<Property name="text" type="java.lang.String" value="For members correctness, required GTFS stops must be present in OSM prior to using this feature."/>
4026+
<Property name="toolTipText" type="java.lang.String" value=""/>
4027+
<Property name="name" type="java.lang.String" value="membersWarningLabel" noResource="true"/>
4028+
</Properties>
4029+
<Constraints>
4030+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
4031+
<GridBagConstraints gridX="1" gridY="7" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
4032+
</Constraint>
4033+
</Constraints>
4034+
</Component>
40204035
</SubComponents>
40214036
<LayoutCode>
40224037
<CodeStatement>
@@ -6310,6 +6325,101 @@
63106325
<CodeExpression id="356_gridBagConstraints"/>
63116326
</Parameters>
63126327
</CodeStatement>
6328+
<CodeStatement>
6329+
<CodeExpression id="363_gridBagConstraints">
6330+
<CodeVariable name="gridBagConstraints"/>
6331+
<ExpressionOrigin>
6332+
<ExpressionProvider type="CodeConstructor">
6333+
<CodeConstructor class="java.awt.GridBagConstraints" parameterTypes=""/>
6334+
</ExpressionProvider>
6335+
</ExpressionOrigin>
6336+
</CodeExpression>
6337+
<StatementProvider type="CodeExpression">
6338+
<CodeExpression id="363_gridBagConstraints"/>
6339+
</StatementProvider>
6340+
</CodeStatement>
6341+
<CodeStatement>
6342+
<CodeExpression id="363_gridBagConstraints"/>
6343+
<StatementProvider type="CodeField">
6344+
<CodeField name="gridx" class="java.awt.GridBagConstraints"/>
6345+
</StatementProvider>
6346+
<Parameters>
6347+
<CodeExpression id="364">
6348+
<ExpressionOrigin>
6349+
<Value type="int" value="1"/>
6350+
</ExpressionOrigin>
6351+
</CodeExpression>
6352+
</Parameters>
6353+
</CodeStatement>
6354+
<CodeStatement>
6355+
<CodeExpression id="363_gridBagConstraints"/>
6356+
<StatementProvider type="CodeField">
6357+
<CodeField name="gridy" class="java.awt.GridBagConstraints"/>
6358+
</StatementProvider>
6359+
<Parameters>
6360+
<CodeExpression id="365">
6361+
<ExpressionOrigin>
6362+
<Value type="int" value="7"/>
6363+
</ExpressionOrigin>
6364+
</CodeExpression>
6365+
</Parameters>
6366+
</CodeStatement>
6367+
<CodeStatement>
6368+
<CodeExpression id="363_gridBagConstraints"/>
6369+
<StatementProvider type="CodeField">
6370+
<CodeField name="gridwidth" class="java.awt.GridBagConstraints"/>
6371+
</StatementProvider>
6372+
<Parameters>
6373+
<CodeExpression id="366">
6374+
<ExpressionOrigin>
6375+
<Value type="int" value="0"/>
6376+
</ExpressionOrigin>
6377+
</CodeExpression>
6378+
</Parameters>
6379+
</CodeStatement>
6380+
<CodeStatement>
6381+
<CodeExpression id="363_gridBagConstraints"/>
6382+
<StatementProvider type="CodeField">
6383+
<CodeField name="fill" class="java.awt.GridBagConstraints"/>
6384+
</StatementProvider>
6385+
<Parameters>
6386+
<CodeExpression id="367">
6387+
<ExpressionOrigin>
6388+
<Value type="int" value="2"/>
6389+
</ExpressionOrigin>
6390+
</CodeExpression>
6391+
</Parameters>
6392+
</CodeStatement>
6393+
<CodeStatement>
6394+
<CodeExpression id="363_gridBagConstraints"/>
6395+
<StatementProvider type="CodeField">
6396+
<CodeField name="anchor" class="java.awt.GridBagConstraints"/>
6397+
</StatementProvider>
6398+
<Parameters>
6399+
<CodeExpression id="368">
6400+
<ExpressionOrigin>
6401+
<Value type="int" value="17"/>
6402+
</ExpressionOrigin>
6403+
</CodeExpression>
6404+
</Parameters>
6405+
</CodeStatement>
6406+
<CodeStatement>
6407+
<CodeExpression id="204_busRoutePanel"/>
6408+
<StatementProvider type="CodeMethod">
6409+
<CodeMethod name="add" class="java.awt.Container" parameterTypes="java.awt.Component, java.lang.Object"/>
6410+
</StatementProvider>
6411+
<Parameters>
6412+
<CodeExpression id="369_membersWarningLabel">
6413+
<CodeVariable name="membersWarningLabel" type="8194" declaredType="javax.swing.JLabel"/>
6414+
<ExpressionOrigin>
6415+
<ExpressionProvider type="ComponentRef">
6416+
<ComponentRef name="membersWarningLabel"/>
6417+
</ExpressionProvider>
6418+
</ExpressionOrigin>
6419+
</CodeExpression>
6420+
<CodeExpression id="363_gridBagConstraints"/>
6421+
</Parameters>
6422+
</CodeStatement>
63136423
</LayoutCode>
63146424
</Container>
63156425
</SubComponents>

‎GO_Sync/src/main/java/edu/usf/cutr/go_sync/gui/ReportViewer.java

+14
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ public void run() {
200200
private org.jdesktop.swingx.JXMapKit mapJXMapKit;
201201
private javax.swing.JTable memberTable;
202202
private javax.swing.ButtonGroup membersButtonGroup;
203+
private javax.swing.JLabel membersWarningLabel;
203204
private javax.swing.JRadioButton newNoMatchStopsRadioButton;
204205
private javax.swing.JRadioButton newRoutesRadioButton;
205206
private javax.swing.JRadioButton newWithMatchStopsRadioButton;
@@ -1814,6 +1815,7 @@ public String getToolTipText(MouseEvent e) {
18141815
saveChangeRouteButton = new javax.swing.JButton();
18151816
jLabel20 = new javax.swing.JLabel();
18161817
osmRoutesComboBox = new javax.swing.JComboBox(osmRoutes);
1818+
membersWarningLabel = new javax.swing.JLabel();
18171819
dummyUploadButton = new javax.swing.JButton();
18181820
uploadDataButton = new javax.swing.JButton();
18191821
stopsCheckbox = new javax.swing.JCheckBox();
@@ -2645,6 +2647,18 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
26452647
gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 5);
26462648
busRoutePanel.add(osmRoutesComboBox, gridBagConstraints);
26472649

2650+
membersWarningLabel.setForeground(java.awt.Color.magenta);
2651+
membersWarningLabel.setText("For members correctness, required GTFS stops must be present in OSM prior to using this feature.");
2652+
membersWarningLabel.setToolTipText("");
2653+
membersWarningLabel.setName("membersWarningLabel"); // NOI18N
2654+
gridBagConstraints = new java.awt.GridBagConstraints();
2655+
gridBagConstraints.gridx = 1;
2656+
gridBagConstraints.gridy = 7;
2657+
gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
2658+
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
2659+
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
2660+
busRoutePanel.add(membersWarningLabel, gridBagConstraints);
2661+
26482662
jTabbedPane1.addTab("Bus Route", busRoutePanel);
26492663

26502664
dummyUploadButton.setFont(new java.awt.Font("Tahoma", 0, 14)); // NOI18N

0 commit comments

Comments
 (0)