Code Triplecheck / Code / Diff of /tool/src/GUI/StartupScreen.java

Diff of /tool/src/GUI/StartupScreen.java [r3] .. [r11]

Switch to unified view


...
    private void initComponents() {

        labelLogo = new javax.swing.JLabel();
        progressBar = new javax.swing.JProgressBar();
        progressText = new javax.swing.JLabel();



        setLocationByPlatform(true);
        setUndecorated(true);
        setResizable(false);


        labelLogo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/logo.png"))); // NOI18N

        progressText.setText("Loading data, please wait..");







        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
        getContentPane().setLayout(layout);
        layout.setHorizontalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(layout.createSequentialGroup()
                .addContainerGap()
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addComponent(progressBar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                    .addGroup(layout.createSequentialGroup()




                        .addComponent(progressText)




                        .addGap(0, 0, Short.MAX_VALUE)))
                .addContainerGap())
            .addGroup(layout.createSequentialGroup()
                .addGap(83, 83, 83)
                .addComponent(labelLogo, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE)
                .addContainerGap(93, Short.MAX_VALUE))




        );
        layout.setVerticalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(layout.createSequentialGroup()
                .addContainerGap(23, Short.MAX_VALUE)
                .addComponent(labelLogo, javax.swing.GroupLayout.PREFERRED_SIZE, 123, javax.swing.GroupLayout.PREFERRED_SIZE)
                .addGap(18, 18, 18)




                .addComponent(progressText)
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(progressBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                .addContainerGap())
        );
...
                new StartupScreen().setVisible(true);
            }
        });
    }
    // Variables declaration - do not modify//GEN-BEGIN:variables

    private javax.swing.JLabel labelLogo;

    private javax.swing.JProgressBar progressBar;
    private javax.swing.JLabel progressText;
    // End of variables declaration//GEN-END:variables

    private void doStartup() {

	a/tool/src/GUI/StartupScreen.java		b/tool/src/GUI/StartupScreen.java
	...		...
64	private void initComponents() {	64	private void initComponents() {
65		65
66	labelLogo = new javax.swing.JLabel();	66	labelLogo = new javax.swing.JLabel();
67	progressBar = new javax.swing.JProgressBar();	67	progressBar = new javax.swing.JProgressBar();
68	progressText = new javax.swing.JLabel();	68	progressText = new javax.swing.JLabel();
69	labelTitle = new javax.swing.JLabel();
70	labelDisclaimer = new javax.swing.JLabel();
71		69
72	setLocationByPlatform(true);	70	setLocationByPlatform(true);
		71	setUndecorated(true);
73	setResizable(false);	72	setResizable(false);
74	setUndecorated(true);
75		73
76	labelLogo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/logo.png"))); // NOI18N	74	labelLogo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/icons/logo.png"))); // NOI18N
77		75
78	progressText.setText("Loading data, please wait..");	76	progressText.setText("Loading data, please wait..");
79
80	labelTitle.setFont(new java.awt.Font("Times New Roman", 0, 48)); // NOI18N
81	labelTitle.setText("SPDX Studio");
82
83	labelDisclaimer.setFont(new java.awt.Font("Tahoma", 2, 10)); // NOI18N
84	labelDisclaimer.setText("<html>SPDX is a registered trademark from the Linux Foundation.<br>\nTo read more details, please visit http://spdx.org</html>");
85		77
86	javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());	78	javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
87	getContentPane().setLayout(layout);	79	getContentPane().setLayout(layout);
88	layout.setHorizontalGroup(	80	layout.setHorizontalGroup(
89	layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)	81	layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
90	.addGroup(layout.createSequentialGroup()	82	.addGroup(layout.createSequentialGroup()
		83	.addContainerGap()
91	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)	84	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
		85	.addComponent(progressBar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
92	.addGroup(layout.createSequentialGroup()	86	.addGroup(layout.createSequentialGroup()
93	.addContainerGap()
94	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
95	.addComponent(progressBar, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
96	.addGroup(layout.createSequentialGroup()
97	.addComponent(progressText)	87	.addComponent(progressText)
98	.addGap(160, 178, Short.MAX_VALUE))))
99	.addGroup(layout.createSequentialGroup()
100	.addGap(55, 55, 55)
101	.addComponent(labelLogo, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE)
102	.addGap(0, 0, Short.MAX_VALUE)))	88	.addGap(0, 0, Short.MAX_VALUE)))
103	.addContainerGap())	89	.addContainerGap())
104	.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()	90	.addGroup(layout.createSequentialGroup()
		91	.addGap(83, 83, 83)
		92	.addComponent(labelLogo, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE)
105	.addGap(0, 0, Short.MAX_VALUE)	93	.addContainerGap(93, Short.MAX_VALUE))
106	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
107	.addComponent(labelDisclaimer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
108	.addComponent(labelTitle))
109	.addGap(21, 21, 21))
110	);	94	);
111	layout.setVerticalGroup(	95	layout.setVerticalGroup(
112	layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)	96	layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
113	.addGroup(layout.createSequentialGroup()	97	.addGroup(layout.createSequentialGroup()
		98	.addContainerGap(23, Short.MAX_VALUE)
114	.addComponent(labelLogo, javax.swing.GroupLayout.PREFERRED_SIZE, 123, javax.swing.GroupLayout.PREFERRED_SIZE)	99	.addComponent(labelLogo, javax.swing.GroupLayout.PREFERRED_SIZE, 123, javax.swing.GroupLayout.PREFERRED_SIZE)
115	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)	100	.addGap(18, 18, 18)
116	.addComponent(labelTitle)
117	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
118	.addComponent(labelDisclaimer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
119	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 32, Short.MAX_VALUE)
120	.addComponent(progressText)	101	.addComponent(progressText)
121	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)	102	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
122	.addComponent(progressBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)	103	.addComponent(progressBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
123	.addContainerGap())	104	.addContainerGap())
124	);	105	);
	...		...
167	new StartupScreen().setVisible(true);	148	new StartupScreen().setVisible(true);
168	}	149	}
169	});	150	});
170	}	151	}
171	// Variables declaration - do not modify//GEN-BEGIN:variables	152	// Variables declaration - do not modify//GEN-BEGIN:variables
172	private javax.swing.JLabel labelDisclaimer;
173	private javax.swing.JLabel labelLogo;	153	private javax.swing.JLabel labelLogo;
174	private javax.swing.JLabel labelTitle;
175	private javax.swing.JProgressBar progressBar;	154	private javax.swing.JProgressBar progressBar;
176	private javax.swing.JLabel progressText;	155	private javax.swing.JLabel progressText;
177	// End of variables declaration//GEN-END:variables	156	// End of variables declaration//GEN-END:variables
178		157
179	private void doStartup() {	158	private void doStartup() {