diff --git a/.classpath b/.classpath index 549bb8f..838a207 100644 --- a/.classpath +++ b/.classpath @@ -12,7 +12,6 @@ - @@ -20,5 +19,6 @@ + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 6249222..8e4055a 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,12 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/cookbook.db b/cookbook.db index 3a2daa6..7c8f9e4 100644 Binary files a/cookbook.db and b/cookbook.db differ diff --git a/src/main/java/db/Cookbook.java b/src/main/java/db/Cookbook.java index 4460b5c..53fa058 100644 --- a/src/main/java/db/Cookbook.java +++ b/src/main/java/db/Cookbook.java @@ -55,13 +55,9 @@ public class Cookbook { public boolean insertRecipe(String name, String ingredients, String description, String tags, ImageIcon img) { try { - //przekształcam ImageIcon -> BuforowanyImg BufferedImage bImg = new BufferedImage(img.getIconWidth(), img.getIconHeight(), BufferedImage.TYPE_INT_ARGB); - bImg.getGraphics().drawImage(img.getImage(), 0,0, null); - //tworzę strumień bajtowy ByteArrayOutputStream bStream = new ByteArrayOutputStream(); - //zapisuję do strumienia bufor obrazka ImageIO.write( bImg, "png", bStream ); bStream.flush(); diff --git a/src/main/java/ksiazka/kucharska/FrmMain.java b/src/main/java/ksiazka/kucharska/FrmMain.java index 6cd84c1..7169f28 100644 --- a/src/main/java/ksiazka/kucharska/FrmMain.java +++ b/src/main/java/ksiazka/kucharska/FrmMain.java @@ -11,6 +11,7 @@ import javax.swing.DefaultListModel; import javax.swing.ImageIcon; import javax.swing.JFileChooser; import javax.swing.JOptionPane; +import javax.swing.JScrollPane; import javax.swing.JSplitPane; import javax.swing.JButton; import javax.swing.JTextField; @@ -47,7 +48,7 @@ public class FrmMain extends JFrame { private static final long serialVersionUID = 2634383304749703669L; private JPanel contentPane; private JTextField txtSearch; - public static JTextField txtEdTitle; + public static JTextField txtEdTitle; public static JTextField txtTags; private JButton btnSave; private JButton btnCancel; @@ -93,8 +94,6 @@ public class FrmMain extends JFrame { lblRecipeTitle.setVisible(false); recipesList.setEnabled(false); imgRecipe.setIcon(imgDefaultRecipe); - - //czyszczenie pól formularza txtDescription.setText(""); txtEdTitle.setText(""); txtIngredients.setText(""); @@ -287,14 +286,12 @@ public class FrmMain extends JFrame { btnLoadImg.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - //otwórz okno dialogowe int returnVal = fcImg.showOpenDialog(FrmMain.this); if (returnVal == JFileChooser.APPROVE_OPTION) { File file = fcImg.getSelectedFile(); try { - BufferedImage srcImg = ImageIO.read(file); //czytaj plik + BufferedImage srcImg = ImageIO.read(file); - //wyznacz szerokość obrazka jako stosunek (przy maksymalizacji wysokości int w = (int)Math.ceil(srcImg.getWidth()/(double)srcImg.getHeight()*imgRecipe.getHeight()); BufferedImage resizedImg = new BufferedImage(w, imgRecipe.getHeight(), BufferedImage.TYPE_INT_ARGB);