Compare commits

..

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

11 changed files with 112 additions and 332 deletions

View file

@ -1,41 +1,3 @@
Vokabeln:
training
Ausbildung
qualification
Abschluss
apprenticeship
Lehre
apprentice
Auszubildener
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
Vokabel
Vokabel

View file

@ -54,7 +54,7 @@ javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
main.class=main
main.class=vokabeltrainer.GUI
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false

View file

@ -1,30 +0,0 @@
import vokabeltrainer.GUI;
/*
* 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.
*/
/**
*
* @author simono41
*/
public class main {
public static void main (String[] args) {
try {
for (javax.swing.UIManager.LookAndFeelInfo info : javax.swing.UIManager.getInstalledLookAndFeels()) {
if ("Nimbus".equals(info.getName())) {
javax.swing.UIManager.setLookAndFeel(info.getClassName());
break;
}
}
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | javax.swing.UnsupportedLookAndFeelException ex) {
java.util.logging.Logger.getLogger(GUI.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
}
new GUI().setVisible(true);
GUI a = new GUI();
a.aktualisieren();
}
}

View file

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

View file

@ -1,30 +0,0 @@
/*
* 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

@ -1,26 +0,0 @@
/*
* 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,7 +20,6 @@ public class write {
bw.write(str);
bw.newLine();
}
bw.close();
}
}
}

View file

@ -1,38 +1,10 @@
<?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"/>
<Property name="title" type="java.lang.String" value="Vokabeltrainer"/>
</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>
@ -136,7 +108,7 @@
<Component id="jLabel8" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace pref="17" max="32767" attributes="0"/>
<EmptySpace pref="38" 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"/>
@ -214,7 +186,7 @@
</Component>
<Component class="javax.swing.JLabel" name="jLabel7">
<Properties>
<Property name="text" type="java.lang.String" value="Loesung = "/>
<Property name="text" type="java.lang.String" value="Eingabe = "/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel8">

View file

@ -5,12 +5,14 @@
*/
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;
@ -25,6 +27,23 @@ public class GUI extends javax.swing.JFrame {
public static String vokabel2;
public static int richtig;
public static int falsch;
private JTextField jTextField1;
private JTextField jTextField2;
private JLabel jLabel1;
private JLabel jLabel2;
private JButton jButton1;
private JButton jButton2;
private JLabel jLabel3;
private JLabel jLabel4;
private JLabel jLabel5;
private JLabel jLabel6;
private JLabel jLabel7;
private JLabel jLabel8;
private JButton jButton3;
private JButton jButton4;
private JLabel jLabel9;
private JLabel jLabel10;
private JButton jButton5;
/**
* Creates new form GUI
@ -59,13 +78,8 @@ 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);
setTitle("Vokabeltrainer");
jTextField1.setText("Vokabel");
@ -102,7 +116,7 @@ public class GUI extends javax.swing.JFrame {
jLabel6.setText("0");
jLabel7.setText("Loesung = ");
jLabel7.setText("Eingabe = ");
jLabel8.setText("n");
@ -131,23 +145,6 @@ 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(
@ -220,7 +217,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, 17, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 38, Short.MAX_VALUE)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jButton4)
.addComponent(jButton5))
@ -237,19 +234,15 @@ 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() == KeyEvent.VK_ENTER) {
if (evt.getKeyCode() == 10) {
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
// TODO add your handling code here:
this.vokabeln();
Vokabeln.main(null);
}//GEN-LAST:event_jButton4ActionPerformed
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
@ -272,25 +265,16 @@ 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);
}
private void vokabel() {
this.aktualisieren();
vokabeln0.add(this.jTextField1.getText());
vokabeln0.add(this.jTextField2.getText());
this.jTextField1.setText("");
this.jTextField2.setText("");
write a = new write();
try {
a.write();
} catch (IOException ex) {
}
catch (IOException ex) {
Logger.getLogger(GUI.class.getName()).log(Level.SEVERE, null, ex);
}
}
@ -299,18 +283,19 @@ public class GUI extends javax.swing.JFrame {
if (this.jTextField2.getText().equals(vokabel1)) {
System.out.println("Richtig");
++richtig;
this.jLabel8.setText("Richtig");
} else {
System.out.println("Falsch");
++falsch;
this.jLabel8.setText("Falsch");
}
this.jLabel8.setText(vokabel1);
this.zufall();
this.jTextField2.setText("");
}
private void zufall() {
int gerade;
int zufallszahl = (int) (Math.random() * (double) vokabeln0.size());
int zufallszahl = (int)(Math.random() * (double)vokabeln0.size());
System.out.println(zufallszahl);
System.out.println(vokabeln0.size());
if (zufallszahl % 2 == 0) {
@ -337,41 +322,53 @@ public class GUI extends javax.swing.JFrame {
this.jLabel10.setText("" + zufallszahl + "." + gerade);
}
public void aktualisieren() {
private void aktualisieren() {
vokabeln0.clear();
read a = new read();
try {
a.read();
} catch (FileNotFoundException ex) {
}
catch (FileNotFoundException ex) {
System.out.println("Datei wird neu Angelegt!");
} catch (IOException ex) {
}
catch (IOException ex) {
Logger.getLogger(GUI.class.getName()).log(Level.SEVERE, null, ex);
}
this.jLabel5.setText(Integer.toString(richtig));
this.jLabel6.setText(Integer.toString(falsch));
}
/**
* @param args the command line arguments
*/
public static void main(String args[]) {
/* Set the Nimbus look and feel */
//<editor-fold defaultstate="collapsed" desc=" Look and feel setting code (optional) ">
/* If Nimbus (introduced in Java SE 6) is not available, stay with the default look and feel.
* For details see http://download.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html
*/
try {
for (javax.swing.UIManager.LookAndFeelInfo info : javax.swing.UIManager.getInstalledLookAndFeels()) {
if ("Nimbus".equals(info.getName())) {
javax.swing.UIManager.setLookAndFeel(info.getClassName());
break;
}
}
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | javax.swing.UnsupportedLookAndFeelException ex) {
java.util.logging.Logger.getLogger(GUI.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
}
//</editor-fold>
//</editor-fold>
/* Create and display the form */
java.awt.EventQueue.invokeLater(() -> {
new GUI().setVisible(true);
});
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton jButton1;
private javax.swing.JButton jButton2;
private javax.swing.JButton jButton3;
private javax.swing.JButton jButton4;
private javax.swing.JButton jButton5;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel10;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel3;
private javax.swing.JLabel jLabel4;
private javax.swing.JLabel jLabel5;
private javax.swing.JLabel jLabel6;
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,12 +26,8 @@
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" 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"/>
<Component id="jScrollPane1" pref="376" max="32767" attributes="0"/>
<Component id="jButton1" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
@ -43,10 +39,7 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane1" min="-2" pref="278" max="-2" attributes="0"/>
<EmptySpace pref="7" max="32767" 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>
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
@ -80,13 +73,5 @@
<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,29 +6,17 @@
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;
/**
*
* @author simono41
*/
public final class Vokabeln extends javax.swing.JFrame {
private int position;
public static ArrayList<String> vokabeln0 = new ArrayList();
public class Vokabeln extends javax.swing.JFrame {
/** Creates new form Vokabeln */
public Vokabeln() {
initComponents();
this.aktualisieren();
}
/** This method is called from within the constructor to
@ -43,7 +31,6 @@ public final 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);
@ -56,13 +43,6 @@ public final 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(
@ -70,11 +50,8 @@ public final class Vokabeln extends javax.swing.JFrame {
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.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))
.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))
.addContainerGap())
);
layout.setVerticalGroup(
@ -83,9 +60,7 @@ public final 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)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jButton1)
.addComponent(jButton2))
.addContainerGap())
);
@ -94,67 +69,44 @@ public final class Vokabeln extends javax.swing.JFrame {
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
// TODO add your handling code here:
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();) {
dim.addElement(GUI.vokabeln0.get(i++) + " = " + GUI.vokabeln0.get(i++));
for (int i = 0; i < GUI.vokabeln0.size(); ++i) {
dim.addElement(GUI.vokabeln0.get(i) + " = " + GUI.vokabeln0.get(i++));
}
this.jList1.setModel(dim);
}//GEN-LAST:event_jButton1ActionPerformed
/**
* @param args the command line arguments
*/
public static void main(String args[]) {
/* Set the Nimbus look and feel */
//<editor-fold defaultstate="collapsed" desc=" Look and feel setting code (optional) ">
/* If Nimbus (introduced in Java SE 6) is not available, stay with the default look and feel.
* For details see http://download.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html
*/
try {
for (javax.swing.UIManager.LookAndFeelInfo info : javax.swing.UIManager.getInstalledLookAndFeels()) {
if ("Nimbus".equals(info.getName())) {
javax.swing.UIManager.setLookAndFeel(info.getClassName());
break;
}
}
} catch (ClassNotFoundException | InstantiationException | IllegalAccessException | javax.swing.UnsupportedLookAndFeelException ex) {
java.util.logging.Logger.getLogger(Vokabeln.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
}
//</editor-fold>
//</editor-fold>
/* Create and display the form */
java.awt.EventQueue.invokeLater(() -> {
new Vokabeln().setVisible(true);
});
}
// 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