Rebase fixen

src/de/jost_net/JVerein/gui/action/StartViewAction.java

@@ -0,0 +1,37 @@
+/**********************************************************************
+ * Copyright (c) by Heiner Jostkleigrewe
+ * This program is free software: you can redistribute it and/or modify it under the terms of the 
+ * GNU General Public License as published by the Free Software Foundation, either version 3 of the 
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without 
+ *  even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
+ *  the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program.  If not, 
+ * see <http://www.gnu.org/licenses/>.
+ * 
+ * [email protected]
+ * www.jverein.de
+ **********************************************************************/
+package de.jost_net.JVerein.gui.action;
+
+import de.willuhn.jameica.gui.AbstractView;
+import de.willuhn.jameica.gui.Action;
+import de.willuhn.jameica.gui.GUI;
+
+public class StartViewAction implements Action
+{
+  private Class<? extends AbstractView> viewClass;
+
+  public StartViewAction(Class<? extends AbstractView> viewClass)
+  {
+    this.viewClass = viewClass;
+  }
+
+  @Override
+  public void handleAction(Object context)
+  {
+    GUI.startView(viewClass, null);
+  }
+}

src/de/jost_net/JVerein/gui/parts/BuchungListPart.java

@@ -0,0 +1,99 @@
+/**********************************************************************
+ * Copyright (c) by Heiner Jostkleigrewe
+ * This program is free software: you can redistribute it and/or modify it under the terms of the 
+ * GNU General Public License as published by the Free Software Foundation, either version 3 of the 
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without 
+ *  even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
+ *  the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program.  If not, 
+ * see <http://www.gnu.org/licenses/>.
+ * 
+ * [email protected]
+ * www.jverein.de
+ **********************************************************************/
+package de.jost_net.JVerein.gui.parts;
+
+import java.rmi.RemoteException;
+import java.util.List;
+
+import de.jost_net.JVerein.Einstellungen;
+import de.jost_net.JVerein.gui.formatter.BuchungsartFormatter;
+import de.jost_net.JVerein.gui.formatter.JaNeinFormatter;
+import de.jost_net.JVerein.gui.formatter.MitgliedskontoFormatter;
+import de.jost_net.JVerein.rmi.Buchung;
+import de.jost_net.JVerein.rmi.Konto;
+import de.jost_net.JVerein.util.JVDateFormatTTMMJJJJ;
+import de.willuhn.jameica.gui.Action;
+import de.willuhn.jameica.gui.formatter.CurrencyFormatter;
+import de.willuhn.jameica.gui.formatter.DateFormatter;
+import de.willuhn.jameica.gui.formatter.Formatter;
+import de.willuhn.jameica.gui.parts.TablePart;
+import de.willuhn.logging.Logger;
+
+public class BuchungListPart extends TablePart
+{
+  public BuchungListPart(Action action)
+  {
+    super(action);
+  }
+
+  public BuchungListPart(List<Buchung> list, Action action)
+  {
+    super(list, action);
+
+    addColumn("Nr", "id-int");
+    addColumn("Konto", "konto", new Formatter()
+    {
+
+      @Override
+      public String format(Object o)
+      {
+        Konto k = (Konto) o;
+        if (k != null)
+        {
+          try
+          {
+            return k.getBezeichnung();
+          }
+          catch (RemoteException e)
+          {
+            Logger.error("Fehler", e);
+          }
+        }
+        return "";
+      }
+    });
+    addColumn("Datum", "datum", new DateFormatter(new JVDateFormatTTMMJJJJ()));
+    addColumn("Auszug", "auszugsnummer");
+    addColumn("Blatt", "blattnummer");
+    addColumn("Name", "name");
+    addColumn("Verwendungszweck", "zweck", new Formatter()
+    {
+
+      @Override
+      public String format(Object value)
+      {
+        if (value == null)
+        {
+          return null;
+        }
+        String s = value.toString();
+        s = s.replaceAll("\r\n", " ");
+        s = s.replaceAll("\r", " ");
+        s = s.replaceAll("\n", " ");
+        return s;
+      }
+    });
+    addColumn("Buchungsart", "buchungsart", new BuchungsartFormatter());
+    addColumn("Betrag", "betrag",
+        new CurrencyFormatter("", Einstellungen.DECIMALFORMAT));
+    addColumn("Mitglied", "mitgliedskonto", new MitgliedskontoFormatter());
+    addColumn("Ersatz für Aufwendungen", "verzicht", new JaNeinFormatter());
+    setRememberColWidths(true);
+    setRememberOrder(true);
+    setRememberState(true);
+  }
+}

src/de/jost_net/JVerein/gui/parts/SollbuchungPositionListPart.java

@@ -0,0 +1,68 @@
+/**********************************************************************
+ * Copyright (c) by Heiner Jostkleigrewe
+ * This program is free software: you can redistribute it and/or modify it under the terms of the 
+ * GNU General Public License as published by the Free Software Foundation, either version 3 of the 
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without 
+ *  even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See 
+ *  the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program.  If not, 
+ * see <http://www.gnu.org/licenses/>.
+ * 
+ * [email protected]
+ * www.jverein.de
+ **********************************************************************/
+package de.jost_net.JVerein.gui.parts;
+
+import java.rmi.RemoteException;
+import java.util.List;
+
+import de.jost_net.JVerein.Einstellungen;
+import de.jost_net.JVerein.gui.formatter.BuchungsartFormatter;
+import de.jost_net.JVerein.gui.formatter.BuchungsklasseFormatter;
+import de.jost_net.JVerein.rmi.SollbuchungPosition;
+import de.jost_net.JVerein.util.JVDateFormatTTMMJJJJ;
+import de.willuhn.jameica.gui.Action;
+import de.willuhn.jameica.gui.formatter.CurrencyFormatter;
+import de.willuhn.jameica.gui.formatter.DateFormatter;
+import de.willuhn.jameica.gui.parts.TablePart;
+import de.willuhn.jameica.gui.parts.table.FeatureSummary;
+
+public class SollbuchungPositionListPart extends TablePart
+{
+  public SollbuchungPositionListPart(Action action)
+  {
+    super(action);
+  }
+
+  public SollbuchungPositionListPart(List<SollbuchungPosition> list,
+      Action action) throws RemoteException
+  {
+    super(list, action);
+
+    addColumn("Datum", "datum", new DateFormatter(new JVDateFormatTTMMJJJJ()));
+    addColumn("Zweck", "zweck");
+    addColumn("Betrag", "betrag",
+        new CurrencyFormatter("", Einstellungen.DECIMALFORMAT));
+    if (Einstellungen.getEinstellung().getOptiert())
+    {
+      addColumn("Nettobetrag", "nettobetrag",
+          new CurrencyFormatter("", Einstellungen.DECIMALFORMAT));
+      addColumn("Steuersatz", "steuersatz");
+      addColumn("Steuerbetrag", "steuerbetrag",
+          new CurrencyFormatter("", Einstellungen.DECIMALFORMAT));
+    }
+    addColumn("Buchungsart", "buchungsart", new BuchungsartFormatter());
+    if (Einstellungen.getEinstellung().getBuchungsklasseInBuchung())
+    {
+      addColumn("Buchungsklasse", "buchungsklasse",
+          new BuchungsklasseFormatter());
+    }
+
+    setRememberColWidths(true);
+    setRememberOrder(true);
+    addFeature(new FeatureSummary());
+  }
+}

src/de/jost_net/JVerein/util/JVDateFormatMMMM.java

@@ -0,0 +1,13 @@
+package de.jost_net.JVerein.util;
+
+import java.text.SimpleDateFormat;
+
+public class JVDateFormatMMMM extends SimpleDateFormat
+{
+  private static final long serialVersionUID = 1874376222061192798L;
+
+  public JVDateFormatMMMM()
+  {
+    super("MMMM");
+  }
+}