- Jaxx-commits - mailman.cloud.codelutin.com

r2604 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model
by kmorin＠users.nuiton.org 09 Mar '13

09 Mar '13

Author: kmorin Date: 2013-03-09 19:11:29 +0100 (Sat, 09 Mar 2013) New Revision: 2604 Url: http://nuiton.org/projects/jaxx/repository/revisions/2604 Log: refs #2580 Make a combobox whose elements can be filtered Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java Copied: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java (from rev 2587, trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxDefaultComboBoxModel.java) =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableComboBoxModel.java 2013-03-09 18:11:29 UTC (rev 2604) @@ -0,0 +1,202 @@ +package jaxx.runtime.swing.model; + +/* + * #%L + * JAXX :: Runtime + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2013 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import com.google.common.base.Predicate; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import javax.swing.DefaultComboBoxModel; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Vector; +import java.util.regex.Pattern; +import org.apache.commons.lang3.StringUtils; +import org.nuiton.util.decorator.JXPathDecorator; + +/** + * ComboBoxModel which can filter the elements displayed in the popup. + * + * @author kmorin <kmorin(a)codelutin.com> + * @since 2.5.12 + */ +public class JaxxFilterableComboBoxModel<E> extends JaxxDefaultComboBoxModel<E> { + + private static final long serialVersionUID = 1L; + + protected ArrayList<E> filteredItems = Lists.newArrayList(); + + protected String filterText; + + /** the decorator of data */ + protected JXPathDecorator<E> decorator; + + protected List<Predicate<E>> filters = Lists.newArrayList(); + + public JaxxFilterableComboBoxModel() { + super(); + } + + public JaxxFilterableComboBoxModel(E... items) { + delegate = new ArrayList<E>(items.length); + + int i, c; + for (i = 0, c = items.length; i < c; i++) + delegate.add(items[i]); + + } + + public JaxxFilterableComboBoxModel(Collection<E> v) { + delegate = new ArrayList<E>(v); + } + + @Override + public int getIndexOf(E anObject) { + return filteredItems.indexOf(anObject); + } + + @Override + public void addAllElements(Collection<E> objects) { + super.addAllElements(objects); + refilter(); + } + + /** Empties the list. */ + @Override + public void removeAllElements() { + super.removeAllElements(); + refilter(); + } + + @Override + public int getSize() { + return filteredItems.size(); + } + + @Override + public E getElementAt(int index) { + E result; + + if (index >= 0 && index < filteredItems.size()) { + result = filteredItems.get(index); + } else { + result = null; + } + return result; + } + + @Override + public void addElement(Object anObject) { + super.addElement(anObject); + refilter(); + } + + @Override + public void insertElementAt(Object anObject, int index) { + super.insertElementAt(anObject, index); + refilter(); + } + + @Override + public void removeElementAt(int index) { + super.removeElementAt(index); + refilter(); + } + + @Override + public void removeElement(Object anObject) { + super.removeElement(anObject); + refilter(); + } + + public String getFilterText() { + return filterText; + } + + public void setFilterText(String filterText) { + this.filterText = filterText; + refilter(); + } + + public JXPathDecorator<E> getDecorator() { + return decorator; + } + + public void setDecorator(JXPathDecorator<E> decorator) { + this.decorator = decorator; + } + + public void addFilter(Predicate<E> filter) { + filters.add(filter); + refilter(); + } + + public void removeFilter(Predicate<E> filter) { + filters.remove(filter); + refilter(); + } + + public void clearFilters() { + filters.clear(); + refilter(); + } + + protected void refilter() { + filteredItems.clear(); + + if (StringUtils.isEmpty(StringUtils.remove(filterText, '*')) + && filters.isEmpty()) { + filteredItems.addAll(delegate); + + } else { + int itemNumber = delegate.size(); + Pattern pattern = null; + if (!StringUtils.isBlank(filterText)) { + String patternText = Pattern.quote(filterText).replace("*", "\\E.*\\Q") + ".*"; + pattern = Pattern.compile(patternText, Pattern.CASE_INSENSITIVE); + } + for (int i = 0 ; i < itemNumber ; i++) { + E element = delegate.get(i); + boolean addElement = true; + for (Predicate<E> filter : filters) { + addElement &= filter.apply(element); + } + String decoratedElement; + if (decorator != null) { + decoratedElement = decorator.toString(element); + } else { + decoratedElement = String.valueOf(element); + } + boolean matches = pattern == null + || pattern.matcher(decoratedElement).matches(); + if (matches && addElement) { + filteredItems.add(element); + } + } + } + + fireContentsChanged(this, 0, getSize()); + } +}

1 0

r2603 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help
by tchemit＠users.nuiton.org 09 Mar '13

09 Mar '13

Author: tchemit Date: 2013-03-09 15:02:50 +0100 (Sat, 09 Mar 2013) New Revision: 2603 Url: http://nuiton.org/projects/jaxx/repository/revisions/2603 Log: fixes #2579: Improve JAXXHelpBroker Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java 2013-03-09 07:21:41 UTC (rev 2602) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java 2013-03-09 14:02:50 UTC (rev 2603) @@ -24,6 +24,7 @@ */ package jaxx.runtime.swing.help; +import com.google.common.base.Preconditions; import jaxx.runtime.JAXXContext; import jaxx.runtime.JAXXObject; import jaxx.runtime.SwingUtil; @@ -33,6 +34,7 @@ import javax.help.CSH; import javax.help.HelpBroker; import javax.help.HelpSet; +import javax.help.plaf.basic.BasicCursorFactory; import javax.swing.AbstractButton; import javax.swing.SwingUtilities; import javax.swing.UIManager; @@ -53,6 +55,7 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.net.URL; +import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; import java.util.Hashtable; @@ -230,15 +233,20 @@ // prepare cursor onItemCursor = (Cursor) UIManager.get("HelpOnItemCursor"); + + if (onItemCursor == null) { + onItemCursor = BasicCursorFactory.getOnItemCursor(); + UIManager.put("HelpOnItemCursor", onItemCursor); + } + Preconditions.checkNotNull(onItemCursor, "A cursor is missing (add HelpOnItemCursor cursor in UIManager)."); Vector<?> topComponents = null; cursors = null; if (onItemCursor != null) { cursors = new Hashtable<Component, Cursor>(); topComponents = getTopContainers(source); - Enumeration<?> enums = topComponents.elements(); - while (enums.hasMoreElements()) { - setAndStoreCursors((Container) enums.nextElement(), onItemCursor); + for (Object topComponent : topComponents) { + setAndStoreCursors((Container) topComponent, onItemCursor); } } @@ -261,9 +269,8 @@ } finally { // restore the old cursors if (topComponents != null) { - Enumeration<?> containers = topComponents.elements(); - while (containers.hasMoreElements()) { - resetAndRestoreCursors((Container) containers.nextElement()); + for (Object topComponent : topComponents) { + resetAndRestoreCursors((Container) topComponent); } } cursors = null; @@ -356,14 +363,12 @@ } } Frame frames[] = Frame.getFrames(); - for (int i = 0; i < frames.length; i++) { - Window[] windows = frames[i].getOwnedWindows(); - for (int j = 0; j < windows.length; j++) { - containers.add(windows[j]); + for (Frame frame : frames) { + Window[] windows = frame.getOwnedWindows(); + Collections.addAll(containers, windows); + if (!containers.contains(frame)) { + containers.add(frame); } - if (!containers.contains(frames[i])) { - containers.add(frames[i]); - } } return containers; } @@ -401,16 +406,21 @@ if (comp == null) { return; } - Cursor compCursor = comp.getCursor(); - if (compCursor != cursor) { - cursors.put(comp, compCursor); - log.debug("set cursor on " + comp); - comp.setCursor(cursor); + if (cache.containsKey(comp)) { + Cursor compCursor = comp.getCursor(); + if (compCursor != cursor) { + cursors.put(comp, compCursor); + if (log.isDebugEnabled()) { + log.debug("set cursor on " + comp); + } + comp.setCursor(cursor); + } } + if (comp instanceof Container) { Component component[] = ((Container) comp).getComponents(); - for (int i = 0; i < component.length; i++) { - setAndStoreCursors(component[i], cursor); + for (Component aComponent : component) { + setAndStoreCursors(aComponent, cursor); } } } @@ -430,8 +440,8 @@ } if (comp instanceof Container) { Component component[] = ((Container) comp).getComponents(); - for (int i = 0; i < component.length; i++) { - resetAndRestoreCursors(component[i]); + for (Component aComponent : component) { + resetAndRestoreCursors(aComponent); } } }

1 0

r2602 - trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 09 Mar '13

09 Mar '13

Author: tchemit Date: 2013-03-09 08:21:41 +0100 (Sat, 09 Mar 2013) New Revision: 2602 Url: http://nuiton.org/projects/jaxx/repository/revisions/2602 Log: refs #2566: Can merge helper ids into inpute files in generate-help-ids mojo (invert test) Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-08 22:43:38 UTC (rev 2601) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-09 07:21:41 UTC (rev 2602) @@ -202,7 +202,7 @@ String filename; - if (StringUtils.isEmpty(locale.getCountry())) { + if (StringUtils.isNotEmpty(locale.getCountry())) { filename = String.format( INPUT_FILENAME_FULL_FORMAT, inputHelpFilenamePrefix,

1 0

r2601 - trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 08 Mar '13

08 Mar '13

Author: tchemit Date: 2013-03-08 23:43:38 +0100 (Fri, 08 Mar 2013) New Revision: 2601 Url: http://nuiton.org/projects/jaxx/repository/revisions/2601 Log: refs #2566: Can merge helper ids into inpute files in generate-help-ids mojo (improve inptu file generation) Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-08 19:07:19 UTC (rev 2600) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-08 22:43:38 UTC (rev 2601) @@ -28,6 +28,7 @@ import com.google.common.io.Closeables; import com.google.common.io.Files; import jaxx.compiler.decorators.HelpRootCompiledObjectDecorator; +import org.apache.commons.lang3.StringUtils; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; @@ -54,8 +55,10 @@ defaultPhase = LifecyclePhase.PROCESS_SOURCES, requiresProject = true) public class GenerateHelpIdsMojo extends AbstractGenerateHelpMojo { - public static final String INPUT_FILENAME_FORMAT = "%s-%s_%s.properties"; + public static final String INPUT_FILENAME_FULL_FORMAT = "%s-%s_%s.properties"; + public static final String INPUT_FILENAME_FORMAT = "%s-%s.properties"; + /** * Flag to merge ids into input directory. * @@ -197,12 +200,21 @@ if (mergeIdsToInput) { - String filename = String.format( - INPUT_FILENAME_FORMAT, - inputHelpFilenamePrefix, - locale.getLanguage(), - locale.getCountry()); + String filename; + if (StringUtils.isEmpty(locale.getCountry())) { + filename = String.format( + INPUT_FILENAME_FULL_FORMAT, + inputHelpFilenamePrefix, + locale.getLanguage(), + locale.getCountry()); + } else { + filename = String.format( + INPUT_FILENAME_FORMAT, + inputHelpFilenamePrefix, + locale.getLanguage()); + } + File inputFile = new File(inputHelpDirectory, filename); getLog().info("Use input file: " + inputFile);

1 0

r2600 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor
by tchemit＠users.nuiton.org 08 Mar '13

08 Mar '13

Author: tchemit Date: 2013-03-08 20:07:19 +0100 (Fri, 08 Mar 2013) New Revision: 2600 Url: http://nuiton.org/projects/jaxx/repository/revisions/2600 Log: fixes #2578: When invoking fileEditor from a dialog with alwaysOnTopdoes not display in top Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2013-03-08 09:50:19 UTC (rev 2599) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditor.jaxx 2013-03-08 19:07:19 UTC (rev 2600) @@ -23,9 +23,12 @@ --> <BaseActionPanel layout='{new BorderLayout()}'> <import> - java.io.File jaxx.runtime.swing.BaseActionPanel + org.apache.commons.lang3.StringUtils + + javax.swing.JDialog + java.io.File </import> <FileEditorHandler id='handler' constructorParams='this'/> @@ -45,31 +48,35 @@ <String id='extsDescription' javaBean='null'/> <script><![CDATA[ - protected File selectedFile; +protected File selectedFile; - public void setSelectedFile(File selectedFile) { - this.selectedFile = selectedFile; - if (selectedFile != null) { - setStartPath(selectedFile.getAbsolutePath()); - fireActionEvent(); - } - } - - public void setSelectedFile(String startPath) { - this.selectedFile = null; - setStartPath(startPath); +public void setSelectedFile(File selectedFile) { + this.selectedFile = selectedFile; + if (selectedFile != null) { + setStartPath(selectedFile.getAbsolutePath()); fireActionEvent(); } +} - public File getSelectedFile() { - if (selectedFile == null) { - if (StringUtils.isNotEmpty(startPath)) { - selectedFile = new File(startPath); - } +public void setSelectedFile(String startPath) { + this.selectedFile = null; + setStartPath(startPath); + fireActionEvent(); +} + +public File getSelectedFile() { + if (selectedFile == null) { + if (StringUtils.isNotEmpty(startPath)) { + selectedFile = new File(startPath); } - return selectedFile; } + return selectedFile; +} +public void setDialogOwner(JDialog dialogOwner) { + handler.setDialogOwner(dialogOwner); +} + ]]></script> <JTextField id='pathField' Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java 2013-03-08 09:50:19 UTC (rev 2599) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/FileEditorHandler.java 2013-03-08 19:07:19 UTC (rev 2600) @@ -24,21 +24,29 @@ package jaxx.runtime.swing.editor; import com.google.common.io.Files; -import java.io.File; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.JDialog; import javax.swing.JFileChooser; import javax.swing.filechooser.FileFilter; -import org.apache.commons.lang3.StringUtils; +import java.io.File; -/** - * @author sletellier <letellier(a)codelutin.com> - */ +/** @author sletellier <letellier(a)codelutin.com> */ public class FileEditorHandler { public static final String SEPARATOR_REGEX = "\\s*,\\s*"; + public static File lastSelectedPath; protected FileEditor view; + /** + * To set the dialog (see http://nuiton.org/issues/2578) + * + * @since 2.5.12 + */ + protected JDialog dialogOwner; + public FileEditorHandler(FileEditor view) { this.view = view; if (lastSelectedPath == null) { @@ -117,7 +125,15 @@ } // show dialog + // see http://nuiton.org/issues/2578 + boolean hackDialog = dialogOwner != null && dialogOwner.isAlwaysOnTop(); + if (hackDialog) { + dialogOwner.setAlwaysOnTop(false); + } int returnVal = fc.showOpenDialog(view); + if (hackDialog) { + dialogOwner.setAlwaysOnTop(true); + } if (returnVal == JFileChooser.APPROVE_OPTION) { // get selected to display in ui @@ -143,6 +159,10 @@ } } + protected void setDialogOwner(JDialog dialogOwner) { + this.dialogOwner = dialogOwner; + } + public static class ExtentionFileFiler extends FileFilter { protected String ext; protected String desciption;

1 0

r2599 - trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 08 Mar '13

08 Mar '13

Author: tchemit Date: 2013-03-08 10:50:19 +0100 (Fri, 08 Mar 2013) New Revision: 2599 Url: http://nuiton.org/projects/jaxx/repository/revisions/2599 Log: fixes #2575: Add a strict mode on generate-help-ids mojo Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-08 09:50:09 UTC (rev 2598) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-08 09:50:19 UTC (rev 2599) @@ -54,7 +54,7 @@ defaultPhase = LifecyclePhase.PROCESS_SOURCES, requiresProject = true) public class GenerateHelpIdsMojo extends AbstractGenerateHelpMojo { - public static final String INPUT_FILENAME_FORMAT = "%s_%s_%s.properties"; + public static final String INPUT_FILENAME_FORMAT = "%s-%s_%s.properties"; /** * Flag to merge ids into input directory. @@ -67,6 +67,23 @@ protected boolean mergeIdsToInput; /** + * Flag to remove obsolete ids into input files. + * + * Important Note: Be sure to use this after a clean, or + * using with {@code jaxx.force} property to get all ids of any jaxx files + * detected, otherwise you could loose some data. USE WITH CAUTION. + * + * Note: Only used when {@code mergeIdsToInput} parameter + * is on. + * + * @since 2.5.12 + */ + @Parameter(property = "jaxx.strictMode", + defaultValue = "false", + required = true) + protected boolean strictMode; + + /** * Directory where to merge (create) input files. * * Note: Only used when {@code mergeIdsToInput} parameter @@ -75,15 +92,15 @@ * @since 2.5.12 */ @Parameter(property = "jaxx.inputHelpDirectory", - defaultValue = "src/main/resources/help", + defaultValue = "src/main/help", required = true) - private File inputHelpDirectory; + protected File inputHelpDirectory; /** * Prefix of input files. * - * Note: {@code _locale.properties} will be added to each - * generated file. + * Note: {@code -locale.properties} will be added to each + * generated file (example: {@code helpMapping-fr_FR.properties}). * * Note: Only used when {@code mergeIdsToInput} parameter * is on. @@ -93,7 +110,7 @@ @Parameter(property = "jaxx.inputHelpFilenamePrefix", defaultValue = "helpMapping", required = true) - private String inputHelpFilenamePrefix; + protected String inputHelpFilenamePrefix; /** help ids to react. */ protected Set<String> helpIds; @@ -133,12 +150,16 @@ boolean b = super.checkSkip(); if (b) { - if (helpIds.isEmpty()) { -// if (isVerbose()) { + if (strictMode) { + + // always launch goal + getLog().info("Strict mode is on, will use all detected ids."); + + } else if (helpIds.isEmpty()) { + // no ids detected in this compilation round getLog().info("No help ids to treate, will skip goal."); -// } - return false; + b = false; } } return b; @@ -198,29 +219,59 @@ } } Set<String> existingId = p.stringPropertyNames(); + Set<String> newIds = new HashSet<String>(); + + SortedProperties resultProperties = p; + + // get all detected ids for (String helpId : helpIds) { newIds.add(removeQuote(helpId)); } - newIds.removeAll(existingId); - if (!newIds.isEmpty()) { - getLog().info("Add " + newIds.size() + " keys."); + if (strictMode) { + // remove all obsolete ids + for (String s : existingId) { + if (!newIds.contains(s)) { + resultProperties.remove(s); + } + } + + // update existing ids + existingId.retainAll(newIds); + } else { + + // remove all existing ids (no need to treat them again) + newIds.removeAll(existingId); + } + + if (newIds.isEmpty()) { + + getLog().info("No keys to add."); + } else { + + if (strictMode) { + getLog().info("Regenerate files with " + newIds.size() + " keys."); + } else { + getLog().info("Add " + newIds.size() + " keys."); + } + for (String helpId : newIds) { - p.put(helpId, ""); + if (!resultProperties.containsKey(helpId)) { + resultProperties.put(helpId, ""); + } } Writer writer = Files.newWriter(inputFile, Charsets.UTF_8); try { - p.store(writer, "Generated by " + getClass().getName()); + resultProperties.store(writer, "Generated by " + getClass().getName()); writer.close(); } finally { Closeables.closeQuietly(writer); } } - } }

1 0

r2598 - trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 08 Mar '13

08 Mar '13

Author: tchemit Date: 2013-03-08 10:50:09 +0100 (Fri, 08 Mar 2013) New Revision: 2598 Url: http://nuiton.org/projects/jaxx/repository/revisions/2598 Log: fixes #2576: Change the default generated help ids filenames Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2013-03-07 23:16:14 UTC (rev 2597) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2013-03-08 09:50:09 UTC (rev 2598) @@ -73,7 +73,7 @@ * * @since 1.3 */ - @Parameter(property = "jaxx.helpIdsFilename", defaultValue = "helpIds.properties", required = true) + @Parameter(property = "jaxx.helpIdsFilename", defaultValue = "helpIds.txt", required = true) private String helpIdsFilename; /** @@ -82,7 +82,7 @@ * * @since 1.3 */ - @Parameter(property = "jaxx.mergeHelpIdsFilename", defaultValue = "helpIds-all.properties", required = true) + @Parameter(property = "jaxx.mergeHelpIdsFilename", defaultValue = "helpIds-all.txt", required = true) private String mergeHelpIdsFilename; /** @@ -243,7 +243,11 @@ try { String id; while ((id = reader.readLine()) != null) { - result.add(id.trim()); + id = id.trim(); + + if (!id.startsWith("#")) { + result.add(id); + } } if (isVerbose()) { getLog().info("load " + result.size() +

1 0

r2597 - trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org 07 Mar '13

07 Mar '13

Author: tchemit Date: 2013-03-08 00:16:14 +0100 (Fri, 08 Mar 2013) New Revision: 2597 Url: http://nuiton.org/projects/jaxx/repository/revisions/2597 Log: fixes #2566: Can merge helper ids into inpute files in generate-help-ids mojo + improve other helps mojos Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2013-03-07 17:30:11 UTC (rev 2596) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2013-03-07 23:16:14 UTC (rev 2597) @@ -119,6 +119,9 @@ /** Call back after doing all stuff for all locales declared */ protected abstract void postDoAction(); + /** Call back before doing all stuff for all locales declared */ + protected abstract void preDoAction() throws IOException; + @Override protected void init() throws Exception { @@ -163,6 +166,8 @@ @Override protected void doAction() throws Exception { + preDoAction(); + for (Locale locale : localesToTreate) { boolean isDefaultLocale = defaultLocale.equals(locale); @@ -231,7 +236,7 @@ protected Set<String> loadHelpIds(File file) throws IOException { - BufferedReader reader = null; + BufferedReader reader; Set<String> result = new HashSet<String>(); reader = new BufferedReader(new InputStreamReader( new FileInputStream(file), getEncoding())); Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2013-03-07 17:30:11 UTC (rev 2596) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2013-03-07 23:16:14 UTC (rev 2597) @@ -35,6 +35,7 @@ import org.nuiton.util.SortedProperties; import java.io.File; +import java.io.IOException; import java.net.URL; import java.util.Enumeration; import java.util.Locale; @@ -213,6 +214,10 @@ } @Override + protected void preDoAction() throws IOException { + } + + @Override protected void postDoAction() { getLog().info(touchedFiles + " file(s) treated."); } Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-07 17:30:11 UTC (rev 2596) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2013-03-07 23:16:14 UTC (rev 2597) @@ -24,12 +24,21 @@ */ package org.nuiton.jaxx.plugin; +import com.google.common.base.Charsets; +import com.google.common.io.Closeables; +import com.google.common.io.Files; import jaxx.compiler.decorators.HelpRootCompiledObjectDecorator; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; +import org.apache.maven.plugins.annotations.Parameter; +import org.nuiton.util.SortedProperties; import java.io.File; +import java.io.IOException; +import java.io.Reader; +import java.io.Writer; +import java.util.HashSet; import java.util.Locale; import java.util.Set; @@ -45,6 +54,47 @@ defaultPhase = LifecyclePhase.PROCESS_SOURCES, requiresProject = true) public class GenerateHelpIdsMojo extends AbstractGenerateHelpMojo { + public static final String INPUT_FILENAME_FORMAT = "%s_%s_%s.properties"; + + /** + * Flag to merge ids into input directory. + * + * @since 2.5.12 + */ + @Parameter(property = "jaxx.mergeIdsToInput", + defaultValue = "false", + required = true) + protected boolean mergeIdsToInput; + + /** + * Directory where to merge (create) input files. + * + * Note: Only used when {@code mergeIdsToInput} parameter + * is on. + * + * @since 2.5.12 + */ + @Parameter(property = "jaxx.inputHelpDirectory", + defaultValue = "src/main/resources/help", + required = true) + private File inputHelpDirectory; + + /** + * Prefix of input files. + * + * Note: {@code _locale.properties} will be added to each + * generated file. + * + * Note: Only used when {@code mergeIdsToInput} parameter + * is on. + * + * @since 2.5.12 + */ + @Parameter(property = "jaxx.inputHelpFilenamePrefix", + defaultValue = "helpMapping", + required = true) + private String inputHelpFilenamePrefix; + /** help ids to react. */ protected Set<String> helpIds; @@ -72,6 +122,10 @@ // always clean helpIdsStore before all cleanHelpIdsStore(); + if (mergeIdsToInput) { + createDirectoryIfNecessary(inputHelpDirectory); + } + } @Override @@ -91,8 +145,7 @@ } @Override - public void doAction() throws Exception { - + protected void preDoAction() throws IOException { // store current jaxx session detected help ids File idsStore = getHelpIdsStoreFile(); @@ -109,13 +162,9 @@ if (idsStoreAll.exists()) { Set<String> allIds = loadHelpIds(idsStoreAll); helpIds.addAll(allIds); - allIds.clear(); } storeHelpIds(idsStoreAll, helpIds); - - helpIds.clear(); - } @Override @@ -124,10 +173,60 @@ File source, String localePath) throws Exception { // nothing to do specific to locale + + if (mergeIdsToInput) { + + String filename = String.format( + INPUT_FILENAME_FORMAT, + inputHelpFilenamePrefix, + locale.getLanguage(), + locale.getCountry()); + + File inputFile = new File(inputHelpDirectory, filename); + + getLog().info("Use input file: " + inputFile); + + SortedProperties p = new SortedProperties(); + + if (inputFile.exists()) { + Reader reader = Files.newReader(inputFile, Charsets.UTF_8); + try { + p.load(reader); + reader.close(); + } finally { + Closeables.closeQuietly(reader); + } + } + Set<String> existingId = p.stringPropertyNames(); + Set<String> newIds = new HashSet<String>(); + for (String helpId : helpIds) { + newIds.add(removeQuote(helpId)); + } + newIds.removeAll(existingId); + if (!newIds.isEmpty()) { + + getLog().info("Add " + newIds.size() + " keys."); + + for (String helpId : newIds) { + p.put(helpId, ""); + } + + Writer writer = Files.newWriter(inputFile, Charsets.UTF_8); + try { + p.store(writer, "Generated by " + getClass().getName()); + writer.close(); + } finally { + Closeables.closeQuietly(writer); + } + + } + + } } @Override protected void postDoAction() { + helpIds.clear(); } @Override Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java 2013-03-07 17:30:11 UTC (rev 2596) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java 2013-03-07 23:16:14 UTC (rev 2597) @@ -31,6 +31,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope; import java.io.File; +import java.io.IOException; import java.util.Locale; /** @@ -59,7 +60,10 @@ @Override public void doAction() throws Exception { + } + @Override + protected void preDoAction() throws IOException { } @Override Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java =================================================================== --- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java 2013-03-07 17:30:11 UTC (rev 2596) +++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java 2013-03-07 23:16:14 UTC (rev 2597) @@ -35,6 +35,7 @@ import org.nuiton.plugin.PluginHelper; import java.io.File; +import java.io.IOException; import java.io.PrintStream; import java.lang.reflect.Method; import java.util.ArrayList; @@ -127,7 +128,7 @@ if (isForce()) { - // always generate if force flag is no + // always generate if force flag is on generate = true; } else if (!target.exists()) { @@ -183,6 +184,10 @@ } @Override + protected void preDoAction() throws IOException { + } + + @Override protected void postDoAction() { // add resources to the project

1 0

r2596 - in trunk: jaxx-runtime/src/main/java/jaxx/runtime/swing/model jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org 07 Mar '13

07 Mar '13

Author: tchemit Date: 2013-03-07 18:30:11 +0100 (Thu, 07 Mar 2013) New Revision: 2596 Url: http://nuiton.org/projects/jaxx/repository/revisions/2596 Log: fix license header Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java 2013-03-07 17:29:13 UTC (rev 2595) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/model/JaxxFilterableListModel.java 2013-03-07 17:30:11 UTC (rev 2596) @@ -9,16 +9,16 @@ * Copyright (C) 2008 - 2013 CodeLutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-03-07 17:29:13 UTC (rev 2595) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanDoubleListHandler.java 2013-03-07 17:30:11 UTC (rev 2596) @@ -9,16 +9,16 @@ * Copyright (C) 2008 - 2012 CodeLutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L%

1 0

r2595 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing
by tchemit＠users.nuiton.org 07 Mar '13

07 Mar '13

Author: tchemit Date: 2013-03-07 18:29:13 +0100 (Thu, 07 Mar 2013) New Revision: 2595 Url: http://nuiton.org/projects/jaxx/repository/revisions/2595 Log: fixes #2565: Fix NPE in ComponentResizer Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/ComponentResizer.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/ComponentResizer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/ComponentResizer.java 2013-03-07 17:18:52 UTC (rev 2594) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/ComponentResizer.java 2013-03-07 17:29:13 UTC (rev 2595) @@ -54,7 +54,7 @@ private static Map<Integer, Integer> cursors = new HashMap<Integer, Integer>(); - { + static { cursors.put(1, Cursor.N_RESIZE_CURSOR); cursors.put(2, Cursor.W_RESIZE_CURSOR); cursors.put(4, Cursor.S_RESIZE_CURSOR);

1 0