Bugfixing + remove bottom

This commit is contained in:
simono41 2016-11-21 20:01:27 +01:00
parent 70ece9ee3d
commit 6fa618a71f
9 changed files with 245 additions and 12 deletions

View file

@ -11,3 +11,31 @@ decision
Entscheidung
chef
Koch
childcare assistant
Kinderpfleger
mechanic
Mechaniker
garage
Autowerkstatt
customer adviser
Kundenbetreuer
advise
beraten
advice
Rat
make-up artist
Maskenbildner
fitness instructor
lange arbeiten
serve
bedienen
repair
reparieren
sporty
sportlich
artistic
kuenstlerisch
organized
organisiert
calm
ruhig

View file

@ -20,6 +20,7 @@ public class read {
while ((zeile = br.readLine()) != null) {
GUI.vokabeln0.add(zeile);
}
br.close();
}
}
}

View file

@ -0,0 +1,30 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package readandwrite;
/**
*
* @author simono41
*/
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import vokabeltrainer.Vokabeln;
public class readandremove {
public void read() throws FileNotFoundException, IOException {
String zeile;
FileReader fr = new FileReader("./Vokabeln.old.txt");
try (BufferedReader br = new BufferedReader(fr)) {
br.readLine();
while ((zeile = br.readLine()) != null) {
Vokabeln.vokabeln0.add(zeile);
}
br.close();
}
}
}

View file

@ -0,0 +1,26 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package readandwrite;
import java.io.BufferedWriter;
import java.io.FileWriter;
import java.io.IOException;
import vokabeltrainer.Vokabeln;
public class remove {
public void write() throws IOException {
FileWriter fw = new FileWriter("./Vokabeln.old.txt");
try (BufferedWriter bw = new BufferedWriter(fw)) {
bw.write("Vokabelnold:");
bw.newLine();
for (String str : Vokabeln.vokabeln0) {
bw.write(str);
bw.newLine();
}
bw.close();
}
}
}

View file

@ -20,6 +20,7 @@ public class write {
bw.write(str);
bw.newLine();
}
bw.close();
}
}
}

View file

@ -1,10 +1,37 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
<NonVisualComponents>
<Menu class="javax.swing.JMenuBar" name="jMenuBar1">
<SubComponents>
<Menu class="javax.swing.JMenu" name="jMenu1">
<Properties>
<Property name="text" type="java.lang.String" value="File"/>
</Properties>
<SubComponents>
<MenuItem class="javax.swing.JMenuItem" name="jMenuItem1">
<Properties>
<Property name="text" type="java.lang.String" value="EXIT"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem1ActionPerformed"/>
</Events>
</MenuItem>
</SubComponents>
</Menu>
<Menu class="javax.swing.JMenu" name="jMenu2">
<Properties>
<Property name="text" type="java.lang.String" value="Edit"/>
</Properties>
</Menu>
</SubComponents>
</Menu>
</NonVisualComponents>
<Properties>
<Property name="defaultCloseOperation" type="int" value="3"/>
</Properties>
<SyntheticProperties>
<SyntheticProperty name="menuBar" type="java.lang.String" value="jMenuBar1"/>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
</SyntheticProperties>
@ -108,7 +135,7 @@
<Component id="jLabel8" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace pref="38" max="32767" attributes="0"/>
<EmptySpace pref="17" max="32767" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jButton4" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jButton5" alignment="3" min="-2" max="-2" attributes="0"/>

View file

@ -5,14 +5,12 @@
*/
package vokabeltrainer;
import java.awt.event.KeyEvent;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JTextField;
import readandwrite.read;
import readandwrite.write;
@ -61,6 +59,10 @@ public class GUI extends javax.swing.JFrame {
jLabel9 = new javax.swing.JLabel();
jLabel10 = new javax.swing.JLabel();
jButton5 = new javax.swing.JButton();
jMenuBar1 = new javax.swing.JMenuBar();
jMenu1 = new javax.swing.JMenu();
jMenuItem1 = new javax.swing.JMenuItem();
jMenu2 = new javax.swing.JMenu();
setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
@ -128,6 +130,23 @@ public class GUI extends javax.swing.JFrame {
}
});
jMenu1.setText("File");
jMenuItem1.setText("EXIT");
jMenuItem1.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jMenuItem1ActionPerformed(evt);
}
});
jMenu1.add(jMenuItem1);
jMenuBar1.add(jMenu1);
jMenu2.setText("Edit");
jMenuBar1.add(jMenu2);
setJMenuBar(jMenuBar1);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
@ -200,7 +219,7 @@ public class GUI extends javax.swing.JFrame {
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jLabel7)
.addComponent(jLabel8)))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 38, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 17, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jButton4)
.addComponent(jButton5))
@ -217,10 +236,14 @@ public class GUI extends javax.swing.JFrame {
private void jTextField2KeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_jTextField2KeyPressed
// TODO add your handling code here:
if (evt.getKeyCode() == 10) {
if (evt.getKeyCode() == KeyEvent.VK_ENTER) {
System.out.println("ENTER");
this.eingabe();
}
if (evt.getKeyCode() == KeyEvent.VK_ALT) {
System.out.println("Neue Vokabel");
this.vokabel();
}
}//GEN-LAST:event_jTextField2KeyPressed
private void jButton4ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton4ActionPerformed
@ -248,6 +271,11 @@ public class GUI extends javax.swing.JFrame {
this.aktualisieren();
}//GEN-LAST:event_jButton5ActionPerformed
private void jMenuItem1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem1ActionPerformed
// TODO add your handling code here:
System.exit(0);
}//GEN-LAST:event_jMenuItem1ActionPerformed
private void vokabeln() {
new Vokabeln().setVisible(true);
}
@ -337,6 +365,10 @@ public class GUI extends javax.swing.JFrame {
private javax.swing.JLabel jLabel7;
private javax.swing.JLabel jLabel8;
private javax.swing.JLabel jLabel9;
private javax.swing.JMenu jMenu1;
private javax.swing.JMenu jMenu2;
private javax.swing.JMenuBar jMenuBar1;
private javax.swing.JMenuItem jMenuItem1;
private javax.swing.JTextField jTextField1;
private javax.swing.JTextField jTextField2;
// End of variables declaration//GEN-END:variables

View file

@ -26,8 +26,12 @@
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jScrollPane1" pref="376" max="32767" attributes="0"/>
<Component id="jButton1" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Component id="jButton1" min="-2" pref="213" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jButton2" pref="158" max="32767" attributes="0"/>
</Group>
<Component id="jScrollPane1" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@ -39,7 +43,10 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane1" min="-2" pref="278" max="-2" attributes="0"/>
<EmptySpace pref="7" max="32767" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jButton2" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
@ -73,5 +80,13 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="jButton2">
<Properties>
<Property name="text" type="java.lang.String" value="Remove"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Form>

View file

@ -6,7 +6,15 @@
package vokabeltrainer;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.DefaultListModel;
import readandwrite.readandremove;
import readandwrite.remove;
import readandwrite.write;
/**
*
@ -14,6 +22,9 @@ import javax.swing.DefaultListModel;
*/
public class Vokabeln extends javax.swing.JFrame {
private int position;
public static ArrayList<String> vokabeln0 = new ArrayList();
/** Creates new form Vokabeln */
public Vokabeln() {
initComponents();
@ -31,6 +42,7 @@ public class Vokabeln extends javax.swing.JFrame {
jScrollPane1 = new javax.swing.JScrollPane();
jList1 = new javax.swing.JList<>();
jButton1 = new javax.swing.JButton();
jButton2 = new javax.swing.JButton();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
@ -43,6 +55,13 @@ public class Vokabeln extends javax.swing.JFrame {
}
});
jButton2.setText("Remove");
jButton2.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton2ActionPerformed(evt);
}
});
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
@ -50,8 +69,11 @@ public class Vokabeln extends javax.swing.JFrame {
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 376, Short.MAX_VALUE)
.addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGroup(layout.createSequentialGroup()
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, 213, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jButton2, javax.swing.GroupLayout.DEFAULT_SIZE, 158, Short.MAX_VALUE))
.addComponent(jScrollPane1))
.addContainerGap())
);
layout.setVerticalGroup(
@ -60,7 +82,9 @@ public class Vokabeln extends javax.swing.JFrame {
.addContainerGap()
.addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 278, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
.addComponent(jButton1)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jButton1)
.addComponent(jButton2))
.addContainerGap())
);
@ -72,6 +96,54 @@ public class Vokabeln extends javax.swing.JFrame {
this.aktualisieren();
}//GEN-LAST:event_jButton1ActionPerformed
private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
// TODO add your handling code here:
this.entfernen();
}//GEN-LAST:event_jButton2ActionPerformed
public void entfernen() {
position = jList1.getSelectedIndex();
System.out.println("Ausgewählt = " + jList1.getSelectedValue());
System.out.println("Ausgewählt = " + position);
System.out.println(GUI.vokabeln0.get(position * 2));
readandremove d = new readandremove();
vokabeln0.clear();
try {
d.read();
} catch (FileNotFoundException ex) {
System.out.println("Datei wird neu Angelegt!");
} catch (IOException ex) {
Logger.getLogger(GUI.class.getName()).log(Level.SEVERE, null, ex);
}
vokabeln0.add(GUI.vokabeln0.get(position * 2));
vokabeln0.add(GUI.vokabeln0.get(position * 2 + 1));
remove c = new remove();
try {
c.write();
} catch (IOException ex) {
Logger.getLogger(Vokabeln.class.getName()).log(Level.SEVERE, null, ex);
}
GUI.vokabeln0.remove(position * 2);
GUI.vokabeln0.remove(position * 2);
this.aktualisieren();
write b = new write();
try {
b.write();
} catch (IOException ex) {
Logger.getLogger(Vokabeln.class.getName()).log(Level.SEVERE, null, ex);
}
GUI a = new GUI();
a.aktualisieren();
}
public void aktualisieren() {
DefaultListModel<String> dim = new DefaultListModel<>();
for (int i = 0; i < GUI.vokabeln0.size();) {
@ -81,6 +153,7 @@ public class Vokabeln extends javax.swing.JFrame {
}
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton jButton1;
private javax.swing.JButton jButton2;
private javax.swing.JList<String> jList1;
private javax.swing.JScrollPane jScrollPane1;
// End of variables declaration//GEN-END:variables