Changeset 8838
- Timestamp:
- Jan 22, 2011, 2:46:45 PM (13 years ago)
- Location:
- extensions/jiwigo/trunk
- Files:
-
- 2 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/jiwigo/trunk/install/install.txt
r6963 r8838 5 5 ##################################################################################### 6 6 7 1 - You must first checkout the project from svn . Create a new Java project from the svn version.7 1 - You must first checkout the project from svn (url is http://piwigo.org/svn/extensions/jiwigo/). Create a new Java project from the svn version. 8 8 2 - Then install maven plugin for eclipse. It is available from that update site : http://m2eclipse.sonatype.org/sites/m2e 9 9 3 - Then enable maven dependency management : right click on the project > maven > enable dependency management. -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/Main.java
r7221 r8838 3 3 import java.io.File; 4 4 import java.io.IOException; 5 5 6 import javax.swing.UIManager; 7 6 8 import com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel; 9 7 10 import fr.mael.jiwigo.transverse.session.SessionManager; 8 11 import fr.mael.jiwigo.transverse.util.Outil; … … 10 13 import fr.mael.jiwigo.ui.ConnexionDialog; 11 14 import fr.mael.jiwigo.ui.mainframe.MainFrame; 12 13 15 14 16 /** … … 38 40 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 39 41 40 * Classe principale de lancement de l'interface.42 * Main class 41 43 * @author mael 42 44 * … … 44 46 public class Main { 45 47 46 47 48 49 50 51 52 53 54 48 /** 49 * Logger 50 */ 51 public static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory.getLog(Main.class); 52 /** 53 * The login and session manager that allows to connect to 54 * the webservice and to query it 55 */ 56 public static SessionManager sessionManager; 55 57 56 57 58 59 58 /** 59 * the main window 60 */ 61 private static MainFrame mainFrame; 60 62 61 62 public static void main(String[] args) { 63 try { 64 UIManager.setLookAndFeel(new NimbusLookAndFeel()); 65 } catch (Exception e) { 66 } 67 File dossierConfig = new File(System.getProperty("user.home") + "/.jiwigo"); 68 if (!dossierConfig.exists()) { 69 dossierConfig.mkdir(); 70 } 71 try { 72 PreferencesManagement.creerFichierParDefaut(); 73 //dialog de connexion 74 ConnexionDialog dialog = new ConnexionDialog(); 75 dialog.showDialog(); 76 } catch (IOException e) { 77 LOG.error(Outil.getStackTrace(e)); 78 } 79 63 public static void main(String[] args) { 64 try { 65 UIManager.setLookAndFeel(new NimbusLookAndFeel()); 66 } catch (Exception e) { 67 } 68 File dossierConfig = new File(System.getProperty("user.home") + "/.jiwigo"); 69 if (!dossierConfig.exists()) { 70 dossierConfig.mkdir(); 71 } 72 try { 73 PreferencesManagement.creerFichierParDefaut(); 74 //dialog de connexion 75 ConnexionDialog dialog = new ConnexionDialog(); 76 dialog.showDialog(); 77 } catch (IOException e) { 78 LOG.error(Outil.getStackTrace(e)); 80 79 } 81 80 81 } 82 82 83 83 public static void showFrame() { 84 84 85 if (mainFrame == null) { 86 mainFrame = MainFrame.getInstance(); 87 } 88 if (!mainFrame.isVisible()) { 89 mainFrame.showUi(); 90 } 85 if (mainFrame == null) { 86 mainFrame = MainFrame.getInstance(); 91 87 } 88 if (!mainFrame.isVisible()) { 89 mainFrame.showUi(); 90 } 91 } 92 92 } -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/dao/ImageDao.java
r8829 r8838 14 14 import fr.mael.jiwigo.Main; 15 15 import fr.mael.jiwigo.om.Image; 16 import fr.mael.jiwigo.transverse.ImagesManagement;17 16 import fr.mael.jiwigo.transverse.enumeration.MethodsEnum; 18 17 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum; 19 18 import fr.mael.jiwigo.transverse.util.Outil; 20 19 import fr.mael.jiwigo.transverse.util.preferences.PreferencesManagement; 20 import fr.mael.jiwigo.ui.mainframe.MainFrame; 21 21 22 22 /** … … 191 191 reussite = false; 192 192 } 193 MainFrame.getInstance().setMessage(""); 193 194 suppressionFichierTemporaires(); 194 195 return reussite; -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/om/Category.java
r6980 r8838 46 46 private Element element; 47 47 private Integer parentDirect; 48 private Integer level; 48 49 49 50 public Category() { … … 197 198 } 198 199 200 public Integer getLevel() { 201 return level; 202 } 203 204 public void setLevel(Integer level) { 205 this.level = level; 206 } 207 199 208 } -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/service/CategoryService.java
r6980 r8838 82 82 * @throws IOException 83 83 */ 84 public List<Category> construireArbre() throws IOException {84 public List<Category> makeTree() throws IOException { 85 85 List<Category> list = CategoryDao.getInstance().lister(true); 86 86 for (Category category : list) { -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/service/ImageService.java
r8829 r8838 7 7 import fr.mael.jiwigo.dao.ImageDao; 8 8 import fr.mael.jiwigo.om.Image; 9 import fr.mael.jiwigo.transverse.ImagesManagement; 9 10 import fr.mael.jiwigo.transverse.enumeration.PreferencesEnum; 10 11 import fr.mael.jiwigo.transverse.util.ImagesUtil; … … 133 134 image.setOriginale(originale); 134 135 image.setIdCategory(idCategory); 136 image.setPrivacyLevel(String.valueOf(ImagesManagement.getInstance().getPrivacyLevel())); 135 137 MainFrame.getInstance() 136 138 .setMessage(Messages.getMessage("mainFrame_sendingFiles") + " " + originalFile.getName()); -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/transverse/session/SessionManager.java
r8830 r8838 168 168 method.addParameter("method", methode); 169 169 for (int i = 0; i < parametres.length; i += 2) { 170 System.out.println(parametres[i] + " -> " + parametres[i + 1]); 170 171 method.addParameter(parametres[i], parametres[i + 1]); 171 172 -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/mainframe/CategoriesTree.java
r8829 r8838 138 138 DefaultMutableTreeNode category = null; 139 139 try { 140 List<Category> list = CategoryService.getInstance(). construireArbre();140 List<Category> list = CategoryService.getInstance().makeTree(); 141 141 for (Category cat : list) { 142 142 if (cat.getCategoriesMeres().size() == 0) { -
extensions/jiwigo/trunk/src/main/java/fr/mael/jiwigo/ui/search/tree/FileTree.java
r8834 r8838 3 3 import java.awt.BorderLayout; 4 4 import java.awt.Dimension; 5 import java.awt.event.ActionEvent; 6 import java.awt.event.ActionListener; 5 7 import java.awt.event.MouseEvent; 6 8 import java.awt.event.MouseListener; … … 9 11 import javax.swing.JFileChooser; 10 12 import javax.swing.JFrame; 13 import javax.swing.JMenuItem; 11 14 import javax.swing.JPanel; 15 import javax.swing.JPopupMenu; 12 16 import javax.swing.JScrollPane; 13 17 import javax.swing.JTextField; … … 17 21 import javax.swing.tree.DefaultMutableTreeNode; 18 22 import javax.swing.tree.DefaultTreeModel; 23 import javax.swing.tree.TreePath; 19 24 import javax.swing.tree.TreeSelectionModel; 20 25 26 import fr.mael.jiwigo.transverse.ImagesManagement; 27 import fr.mael.jiwigo.ui.mainframe.DialogPrivacyLevel; 28 import fr.mael.jiwigo.ui.search.DialogChooseCategory; 21 29 import fr.mael.jiwigo.ui.search.File; 22 30 … … 50 58 * File tree 51 59 */ 52 public class FileTree extends JPanel implements TreeSelectionListener, MouseListener {60 public class FileTree extends JPanel implements TreeSelectionListener, MouseListener, ActionListener { 53 61 private String path; 54 62 … … 58 66 59 67 private JTree tree; 68 69 private ArrayList<File> filesToSend; 70 71 /** 72 * the menu to add a category 73 */ 74 private JMenuItem menuSend; 60 75 61 76 public static void main(String[] args) { … … 78 93 fieldPath.addMouseListener(this); 79 94 tree = new JTree(root); 80 tree.getSelectionModel().setSelectionMode(TreeSelectionModel. SINGLE_TREE_SELECTION);95 tree.getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION); 81 96 tree.addTreeSelectionListener(this); 82 97 tree.setCellRenderer(new MyTreeCellRenderer()); 83 98 tree.setRootVisible(false); 99 tree.addMouseListener(this); 84 100 JScrollPane treeView = new JScrollPane(tree); 85 101 Dimension minimumSize = new Dimension(100, 50); … … 90 106 } 91 107 108 /** 109 * Method that reload the tree 110 */ 92 111 public void reload() { 93 112 root.removeAllChildren(); … … 96 115 } 97 116 117 /** 118 * This method creates filters the files to display depending on their 119 * extension (only image files) 120 * @param root 121 */ 98 122 private void createNodes(DefaultMutableTreeNode root) { 99 123 DefaultMutableTreeNode fileNode = null; … … 103 127 ArrayList<File> filter = new ArrayList<File>(); 104 128 for (File file : fls) { 129 //only png and jpg are displayed 105 130 if ((file.isDirectory() && !(file.getName().charAt(0) == '.')) 106 131 || (file.isFile() && ((file.getName().toLowerCase().endsWith(".jpg") … … 110 135 } 111 136 } 137 //call to the method that creates the files hierarchy 112 138 for (File file : filter) { 113 139 fileNode = new DefaultMutableTreeNode(file); … … 154 180 155 181 @Override 156 public void mouseClicked(MouseEvent arg0) {157 if ( arg0.getSource().equals(fieldPath)) {182 public void mouseClicked(MouseEvent mouseEvent) { 183 if (mouseEvent.getSource().equals(fieldPath)) { 158 184 JFileChooser chooser = new JFileChooser(); 159 185 chooser.setCurrentDirectory(new java.io.File(path)); … … 166 192 } 167 193 } 194 195 if (mouseEvent.getButton() == 3) { 196 filesToSend = new ArrayList<File>(); 197 TreePath treePath[] = tree.getSelectionPaths(); 198 for (TreePath treeP : treePath) { 199 DefaultMutableTreeNode node = (DefaultMutableTreeNode) treeP.getLastPathComponent(); 200 File file = (File) node.getUserObject(); 201 filesToSend.add(file); 202 } 203 JPopupMenu popup = new JPopupMenu(); 204 menuSend = new JMenuItem("Envoyer"); 205 menuSend.addActionListener(this); 206 popup.add(menuSend); 207 popup.show(tree, mouseEvent.getX(), mouseEvent.getY()); 208 } 168 209 } 169 210 … … 196 237 } 197 238 239 @Override 240 public void actionPerformed(ActionEvent paramActionEvent) { 241 if (paramActionEvent.getSource().equals(menuSend)) { 242 //first, the dialog that allows to choose the privacy level of the photo(s) is called 243 if (!ImagesManagement.getInstance().isRememberPrivacyLevel()) { 244 new DialogPrivacyLevel(); 245 } 246 //then the dialog that allow to choose the category is called 247 new DialogChooseCategory(filesToSend); 248 } 249 } 250 198 251 }
Note: See TracChangeset
for help on using the changeset viewer.