Merge branch 'master' of ssh://git.pioder.pl:24/ksiazka-kucharska

src/main/java/ksiazka/kucharska/App.java

@@ -10,12 +10,11 @@ public class App
 {
     public static void main( String[] args )
     {
-        System.out.println( "Hello World!" );
-        System.out.println( "test repo!" );
-        System.out.println("\rPioDer test2\n");
+        System.out.println( "Książka Kucharska v1.0" );
         EventQueue.invokeLater(new Runnable() {
 			public void run() {
 				try {
+					System.out.println( "tworzę fMain..." );
 					FrmMain fMain = new FrmMain();
 					fMain.setVisible(true);
 				} catch (Exception e) {

src/main/java/ksiazka/kucharska/FrmMain.java

@@ -19,6 +19,8 @@ import javax.swing.JLabel;
 import java.awt.Font;
 import javax.swing.border.LineBorder;
 import java.awt.SystemColor;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
 
 public class FrmMain extends JFrame {
 
@@ -27,7 +29,44 @@ public class FrmMain extends JFrame {
 	 */
 	private static final long serialVersionUID = 2634383304749703669L;
 	private JPanel contentPane;
-	private JTextField txtWpiszTytutagi;
+	private JTextField txtSearch;
+	private JTextField txtEdTitle;
+	private JTextField txtTags;
+	private JButton btnSave;
+	private JButton btnCancel;
+	private JTextPane txtIngredients;
+	private JTextPane txtDescription;
+	private JButton btnAddRecipe;
+	private JButton btnSearch;
+	private JButton btnDelRecipe;
+	private JButton btnLoadImg;
+	private JLabel lblRecipeTitle;
+	
+	void DeactivateAddMenu() {
+		btnCancel.setVisible(false);
+		btnDelRecipe.setEnabled(true);
+		btnLoadImg.setVisible(false);
+		btnSearch.setEnabled(true);
+		btnSave.setVisible(false);
+		txtDescription.setEditable(false);
+		txtEdTitle.setVisible(false);
+		txtIngredients.setEditable(false);
+		txtTags.setEditable(false);
+		lblRecipeTitle.setVisible(true);
+	}
+	
+	void ActivateAddMenu() {
+		btnCancel.setVisible(true);
+		btnDelRecipe.setEnabled(false);
+		btnLoadImg.setVisible(true);
+		btnSearch.setEnabled(false);
+		btnSave.setVisible(true);
+		txtDescription.setEditable(true);
+		txtEdTitle.setVisible(true);
+		txtIngredients.setEditable(true);
+		txtTags.setEditable(true);
+		lblRecipeTitle.setVisible(false);
+	}
 
 	/**
 	 * Create the frame.
@@ -36,7 +75,7 @@ public class FrmMain extends JFrame {
 		setResizable(false);
 		setTitle("Książka Kucharska v1.0");
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		setBounds(100, 100, 800, 500);
+		setBounds(100, 100, 800, 549);
 		contentPane = new JPanel();
 		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
 		contentPane.setLayout(new BorderLayout(0, 0));
@@ -57,17 +96,17 @@ public class FrmMain extends JFrame {
 		gbl_panel.rowWeights = new double[]{0.0, 1.0, 0.0};
 		panel.setLayout(gbl_panel);
 		
-		txtWpiszTytutagi = new JTextField();
-		txtWpiszTytutagi.setText("wpisz tytuł/tagi...");
-		GridBagConstraints gbc_txtWpiszTytutagi = new GridBagConstraints();
-		gbc_txtWpiszTytutagi.insets = new Insets(0, 0, 5, 5);
-		gbc_txtWpiszTytutagi.fill = GridBagConstraints.HORIZONTAL;
-		gbc_txtWpiszTytutagi.gridx = 0;
-		gbc_txtWpiszTytutagi.gridy = 0;
-		panel.add(txtWpiszTytutagi, gbc_txtWpiszTytutagi);
-		txtWpiszTytutagi.setColumns(10);
-		
-		JButton btnSearch = new JButton("Szukaj");
+		txtSearch = new JTextField();
+		txtSearch.setText("wpisz tytuł/tagi...");
+		GridBagConstraints gbc_txtSearch = new GridBagConstraints();
+		gbc_txtSearch.insets = new Insets(0, 0, 5, 5);
+		gbc_txtSearch.fill = GridBagConstraints.HORIZONTAL;
+		gbc_txtSearch.gridx = 0;
+		gbc_txtSearch.gridy = 0;
+		panel.add(txtSearch, gbc_txtSearch);
+		txtSearch.setColumns(10);
+		
+		btnSearch = new JButton("Szukaj");
 		GridBagConstraints gbc_btnSearch = new GridBagConstraints();
 		gbc_btnSearch.anchor = GridBagConstraints.NORTH;
 		gbc_btnSearch.fill = GridBagConstraints.HORIZONTAL;
@@ -96,27 +135,48 @@ public class FrmMain extends JFrame {
 		panel.add(panel_1, gbc_panel_1);
 		panel_1.setLayout(new GridLayout(0, 2, 0, 0));
 		
-		JButton btnAddRecipe = new JButton("Dodaj");
+		btnAddRecipe = new JButton("Dodaj");
+		btnAddRecipe.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				ActivateAddMenu();
+			}
+		});
 		panel_1.add(btnAddRecipe);
 		
-		JButton btnDelRecipe = new JButton("Usuń");
+		btnDelRecipe = new JButton("Usuń");
 		panel_1.add(btnDelRecipe);
 		
 		JPanel panel_2 = new JPanel();
 		splitPane.setRightComponent(panel_2);
 		panel_2.setLayout(null);
 		
-		JTextPane textPane = new JTextPane();
-		textPane.setEditable(false);
-		textPane.setBounds(26, 88, 228, 126);
-		panel_2.add(textPane);
+		btnSave = new JButton("Zapisz");
+		btnSave.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				DeactivateAddMenu();
+			}
+		});
+		btnSave.setVisible(false);
+		btnSave.setBounds(319, 12, 117, 25);
+		panel_2.add(btnSave);
+		
+		txtEdTitle = new JTextField();
+		txtEdTitle.setVisible(false);
+		txtEdTitle.setBounds(12, 15, 295, 19);
+		panel_2.add(txtEdTitle);
+		txtEdTitle.setColumns(10);
+		
+		txtIngredients = new JTextPane();
+		txtIngredients.setEditable(false);
+		txtIngredients.setBounds(26, 88, 228, 126);
+		panel_2.add(txtIngredients);
 		
-		JTextPane textPane_1 = new JTextPane();
-		textPane_1.setEditable(false);
-		textPane_1.setBounds(26, 254, 410, 196);
-		panel_2.add(textPane_1);
+		txtDescription = new JTextPane();
+		txtDescription.setEditable(false);
+		txtDescription.setBounds(26, 254, 410, 196);
+		panel_2.add(txtDescription);
 		
-		JLabel lblRecipeTitle = new JLabel("Nazwa przepisu");
+		lblRecipeTitle = new JLabel("Nazwa przepisu");
 		lblRecipeTitle.setFont(new Font("Dialog", Font.BOLD, 18));
 		lblRecipeTitle.setBounds(12, 12, 442, 22);
 		panel_2.add(lblRecipeTitle);
@@ -129,9 +189,35 @@ public class FrmMain extends JFrame {
 		lblDescription.setBounds(26, 227, 152, 15);
 		panel_2.add(lblDescription);
 		
-		JLabel lblNewLabel_3 = new JLabel("");
-		lblNewLabel_3.setBorder(new LineBorder(SystemColor.textHighlightText));
-		lblNewLabel_3.setBounds(272, 88, 164, 126);
-		panel_2.add(lblNewLabel_3);
+		JLabel imgRecipe = new JLabel("");
+		imgRecipe.setBorder(new LineBorder(SystemColor.textHighlightText));
+		imgRecipe.setBounds(272, 88, 164, 126);
+		panel_2.add(imgRecipe);
+		
+		btnLoadImg = new JButton("Wczytaj");
+		btnLoadImg.setVisible(false);
+		btnLoadImg.setBounds(304, 217, 102, 25);
+		panel_2.add(btnLoadImg);
+		
+		txtTags = new JTextField();
+		txtTags.setEditable(false);
+		txtTags.setBounds(26, 480, 410, 19);
+		panel_2.add(txtTags);
+		txtTags.setColumns(10);
+		
+		JLabel lblTags = new JLabel("Tagi:");
+		lblTags.setBounds(26, 462, 70, 15);
+		panel_2.add(lblTags);
+		
+		btnCancel = new JButton("Anuluj");
+		btnCancel.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				DeactivateAddMenu();
+			}
+		});
+		btnCancel.setVisible(false);
+		btnCancel.setBounds(319, 46, 117, 25);
+		panel_2.add(btnCancel);
+		
 	}
 }

target/maven-archiver/pom.properties

@@ -1,5 +0,0 @@
-#Generated by Maven
-#Wed Jun 11 17:22:03 CEST 2014
-version=1.0
-groupId=ksiazka.kucharska
-artifactId=ksiazka-kucharska

target/surefire-reports/TEST-ksiazka.kucharska.AppTest.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite failures="0" time="0.003" errors="0" skipped="0" tests="1" name="ksiazka.kucharska.AppTest">
-  <properties>
-    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
-    <property name="sun.boot.library.path" value="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64"/>
-    <property name="java.vm.version" value="24.51-b03"/>
-    <property name="java.vm.vendor" value="Oracle Corporation"/>
-    <property name="java.vendor.url" value="http://java.oracle.com/"/>
-    <property name="path.separator" value=":"/>
-    <property name="guice.disable.misplaced.annotation.check" value="true"/>
-    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
-    <property name="file.encoding.pkg" value="sun.io"/>
-    <property name="user.country" value="PL"/>
-    <property name="sun.java.launcher" value="SUN_STANDARD"/>
-    <property name="sun.os.patch.level" value="unknown"/>
-    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
-    <property name="user.dir" value="/home/piotrek/eclipse-projekty/ksiazka-kucharska"/>
-    <property name="java.runtime.version" value="1.7.0_51-b31"/>
-    <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
-    <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/endorsed"/>
-    <property name="os.arch" value="amd64"/>
-    <property name="java.io.tmpdir" value="/tmp"/>
-    <property name="line.separator" value="
-"/>
-    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
-    <property name="os.name" value="Linux"/>
-    <property name="classworlds.conf" value="/home/piotrek/eclipse-projekty/.metadata/.plugins/org.eclipse.m2e.core/launches/m2conf2952025984638839487.tmp"/>
-    <property name="sun.jnu.encoding" value="UTF-8"/>
-    <property name="java.library.path" value="/usr/java/packages/lib/amd64:/usr/lib/x86_64-linux-gnu/jni:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/jni:/lib:/usr/lib"/>
-    <property name="java.specification.name" value="Java Platform API Specification"/>
-    <property name="java.class.version" value="51.0"/>
-    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
-    <property name="os.version" value="3.13-1-amd64"/>
-    <property name="user.home" value="/home/piotrek"/>
-    <property name="user.timezone" value="Europe/Warsaw"/>
-    <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
-    <property name="file.encoding" value="UTF-8"/>
-    <property name="java.specification.version" value="1.7"/>
-    <property name="user.name" value="piotrek"/>
-    <property name="java.class.path" value="/opt/apache-maven-3.2.1/boot/plexus-classworlds-2.5.1.jar"/>
-    <property name="org.slf4j.simpleLogger.defaultLogLevel" value="info"/>
-    <property name="java.vm.specification.version" value="1.7"/>
-    <property name="sun.arch.data.model" value="64"/>
-    <property name="java.home" value="/usr/lib/jvm/java-7-openjdk-amd64/jre"/>
-    <property name="sun.java.command" value="org.codehaus.classworlds.Launcher -B clean install"/>
-    <property name="java.specification.vendor" value="Oracle Corporation"/>
-    <property name="user.language" value="pl"/>
-    <property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
-    <property name="java.vm.info" value="mixed mode"/>
-    <property name="java.version" value="1.7.0_51"/>
-    <property name="java.ext.dirs" value="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/ext:/usr/java/packages/lib/ext"/>
-    <property name="securerandom.source" value="file:/dev/./urandom"/>
-    <property name="sun.boot.class.path" value="/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/resources.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jsse.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jce.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/charsets.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/netx.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/plugin.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rhino.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jfr.jar:/usr/lib/jvm/java-7-openjdk-amd64/jre/classes"/>
-    <property name="java.vendor" value="Oracle Corporation"/>
-    <property name="maven.home" value="/opt/apache-maven-3.2.1"/>
-    <property name="file.separator" value="/"/>
-    <property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
-    <property name="sun.cpu.endian" value="little"/>
-    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
-    <property name="sun.cpu.isalist" value=""/>
-  </properties>
-  <testcase time="0.003" classname="ksiazka.kucharska.AppTest" name="testApp"/>
-</testsuite>

target/surefire-reports/ksiazka.kucharska.AppTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: ksiazka.kucharska.AppTest
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec