Andrey_Abazov/NetBeans_Test2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Andrey_Abazov:NewBranch2
Branches Tags
Andrey_Abazov:master
Andrey_Abazov:NewBranch3
Andrey_Abazov:NewBranch2
Andrey_Abazov:NewBranch1
..
compare: Andrey_Abazov:master
Branches Tags
Andrey_Abazov:NewBranch3
Andrey_Abazov:NewBranch2
Andrey_Abazov:NewBranch1
Andrey_Abazov:master

No commits in common. "NewBranch2" and "master" have entirely different histories.
NewBranch2 ... master

4 changed files with 4 additions and 58 deletions
Show Stats Expand all files Collapse all files

13
TestFrame2/src/TestPackage2/FooClass.java
View File

@ -1,13 +0,0 @@
/*
* Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
*/
package TestPackage2;
/**
*
* @author Андрей
*/
public class FooClass {
public int foo;
}

13
TestFrame2/src/TestPackage2/FooClass2.java
View File

@ -1,13 +0,0 @@
/*
* Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
*/
package TestPackage2;
/**
*
* @author Андрей
*/
public class FooClass2 {
private char foo;
}

19
TestFrame2/src/TestPackage2/TestJForm2.form
View File

@ -23,28 +23,13 @@
<Layout> <Layout>
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <EmptySpace min="0" pref="400" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="229" max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="233" max="32767" attributes="0"/>
</Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
<DimensionLayout dim="1"> <DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <EmptySpace min="0" pref="300" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="172" max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="189" max="32767" attributes="0"/>
</Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
</Layout> </Layout>
<SubComponents>
<Component class="javax.swing.JButton" name="jButton1">
<Properties>
<Property name="text" type="java.lang.String" value="jButton1"/>
</Properties>
</Component>
</SubComponents>
</Form> </Form>

17
TestFrame2/src/TestPackage2/TestJForm2.java
View File

@ -16,8 +16,6 @@ public class TestJForm2 extends javax.swing.JFrame {
public TestJForm2() { public TestJForm2() {
initComponents(); initComponents();
} }
public String foo;
public String foo2;
/** /**
* This method is called from within the constructor to initialize the form. * This method is called from within the constructor to initialize the form.
@ -28,27 +26,17 @@ public class TestJForm2 extends javax.swing.JFrame {
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
jButton1 = new javax.swing.JButton();
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE); setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
jButton1.setText("jButton1");
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout); getContentPane().setLayout(layout);
layout.setHorizontalGroup( layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGap(0, 400, Short.MAX_VALUE)
.addGap(229, 229, 229)
.addComponent(jButton1)
.addContainerGap(233, Short.MAX_VALUE))
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGap(0, 300, Short.MAX_VALUE)
.addGap(172, 172, 172)
.addComponent(jButton1)
.addContainerGap(189, Short.MAX_VALUE))
); );
pack(); pack();
@ -90,6 +78,5 @@ public class TestJForm2 extends javax.swing.JFrame {
} }
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton jButton1;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }