Menu
▾
▴
[posper-commits] SF.net SVN: posper:[848] 1.00
|
From: <han...@us...> - 2010-10-11 10:13:01
|
Revision: 848
http://posper.svn.sourceforge.net/posper/?rev=848&view=rev
Author: hans_artmann
Date: 2010-10-11 10:12:54 +0000 (Mon, 11 Oct 2010)
Log Message:
-----------
- fix category selection bug SF #3037463
- new basic revision number and schema number
Modified Paths:
--------------
1.00/CHANGELOG
1.00/buildNumber.properties
1.00/pom.xml
1.00/src/main/java/net/adrianromero/tpv/inventory/ProductsEditor.form
1.00/src/main/java/net/adrianromero/tpv/inventory/ProductsEditor.java
1.00/src/main/resources/basic.properties
Modified: 1.00/CHANGELOG
===================================================================
--- 1.00/CHANGELOG 2010-10-08 13:11:28 UTC (rev 847)
+++ 1.00/CHANGELOG 2010-10-11 10:12:54 UTC (rev 848)
@@ -69,3 +69,4 @@
- add an activation modifier to products
- add customergroup modifier (not yet evaluated)
- add Modifiers#getCustomerMask and Modifiers#getCustomerGroupMask (not used until customers can be assigned)
+- fix category selection bug SF #3037463
Modified: 1.00/buildNumber.properties
===================================================================
--- 1.00/buildNumber.properties 2010-10-08 13:11:28 UTC (rev 847)
+++ 1.00/buildNumber.properties 2010-10-11 10:12:54 UTC (rev 848)
@@ -1,3 +1,3 @@
#maven.buildNumber.plugin properties file
-#Mon Aug 30 23:34:13 CEST 2010
-buildNumber0=40
+#Mon Oct 11 10:39:05 CEST 2010
+buildNumber0=48
Modified: 1.00/pom.xml
===================================================================
--- 1.00/pom.xml 2010-10-08 13:11:28 UTC (rev 847)
+++ 1.00/pom.xml 2010-10-11 10:12:54 UTC (rev 848)
@@ -68,7 +68,8 @@
<doCheck>true</doCheck>
<doUpdate>true</doUpdate>
<useLastCommittedRevision>true</useLastCommittedRevision>
- <format>{0}-{1,number}-{2,date,yyyy-MM-dd}</format>
+ <!--format>{0}-{1,number}-{2,date,yyyy-MM-dd}</format-->
+ <format>{0}-{2,date,yyyy-MM-dd}</format>
<items>
<item>scmVersion</item>
<item>buildNumber0</item>
@@ -454,8 +455,8 @@
</dependency>
</dependencies>
<scm>
- <connection>scm:svn:https://posper.svn.sourceforge.net/svnroot/posper/0.601ha</connection>
- <developerConnection>scm:svn:https://posper.svn.sourceforge.net/svnroot/posper/0.601ha</developerConnection>
- <url>https://posper.svn.sourceforge.net/svnroot/posper/0.601ha</url>
+ <connection>scm:svn:https://posper.svn.sourceforge.net/svnroot/posper/1.0</connection>
+ <developerConnection>scm:svn:https://posper.svn.sourceforge.net/svnroot/posper/1.0</developerConnection>
+ <url>https://posper.svn.sourceforge.net/svnroot/posper/1.0</url>
</scm>
</project>
Modified: 1.00/src/main/java/net/adrianromero/tpv/inventory/ProductsEditor.form
===================================================================
--- 1.00/src/main/java/net/adrianromero/tpv/inventory/ProductsEditor.form 2010-10-08 13:11:28 UTC (rev 847)
+++ 1.00/src/main/java/net/adrianromero/tpv/inventory/ProductsEditor.form 2010-10-11 10:12:54 UTC (rev 848)
@@ -81,7 +81,7 @@
<Container class="javax.swing.JPanel" name="jPanel1">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
- <JTabbedPaneConstraints tabName="Allgemein">
+ <JTabbedPaneConstraints tabName="General">
<Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="net/adrianromero/tpv/i18n/messages.properties" key="label.prodgeneral" replaceFormat="AppLocal.getInstance().getIntString("{key}")"/>
</Property>
@@ -256,7 +256,7 @@
<Container class="javax.swing.JPanel" name="jPanelCategories">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
- <JTabbedPaneConstraints tabName="Kategorien">
+ <JTabbedPaneConstraints tabName="Categories">
<Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="net/adrianromero/tpv/i18n/messages.properties" key="ProductsEditor.jPanelCategories.TabConstraints.tabTitle" replaceFormat="AppLocal.getInstance().getIntString("{key}")"/>
</Property>
@@ -308,7 +308,7 @@
<Container class="javax.swing.JPanel" name="jPanelTaxes">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
- <JTabbedPaneConstraints tabName="Steuern">
+ <JTabbedPaneConstraints tabName="Taxes">
<Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="net/adrianromero/tpv/i18n/messages.properties" key="label.prodtaxes" replaceFormat="AppLocal.getInstance().getIntString("{key}")"/>
</Property>
@@ -368,7 +368,7 @@
<Container class="javax.swing.JPanel" name="jPanel4">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
- <JTabbedPaneConstraints tabName="Eigenschaften">
+ <JTabbedPaneConstraints tabName="Properties">
<Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="net/adrianromero/tpv/i18n/messages.properties" key="label.prodproperties" replaceFormat="AppLocal.getInstance().getIntString("{key}")"/>
</Property>
@@ -501,7 +501,7 @@
<Container class="javax.swing.JPanel" name="jPanel2">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
- <JTabbedPaneConstraints tabName="Bestand">
+ <JTabbedPaneConstraints tabName="Stock">
<Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="net/adrianromero/tpv/i18n/messages.properties" key="label.prodstock" replaceFormat="AppLocal.getInstance().getIntString("{key}")"/>
</Property>
Modified: 1.00/src/main/java/net/adrianromero/tpv/inventory/ProductsEditor.java
===================================================================
--- 1.00/src/main/java/net/adrianromero/tpv/inventory/ProductsEditor.java 2010-10-08 13:11:28 UTC (rev 847)
+++ 1.00/src/main/java/net/adrianromero/tpv/inventory/ProductsEditor.java 2010-10-11 10:12:54 UTC (rev 848)
@@ -1379,14 +1379,16 @@
//non-editable.
NamesAndChecksModel mod = (NamesAndChecksModel) m_jCategoriesTable.getModel();
- mod.unlock();
-
- Category curr_cat = m_CategoryModel.getSelectedItem();
-
- mod.setAssociation(curr_cat.getName(), true);
-
- mod.lock(curr_cat.getName());
-
+ switch (evt.getStateChange()) {
+ case java.awt.event.ItemEvent.DESELECTED:
+ mod.unlock();
+ mod.setAssociation(evt.getItem().toString(), false);
+ break;
+ case java.awt.event.ItemEvent.SELECTED:
+ mod.setAssociation(evt.getItem().toString(), true);
+ mod.lock(evt.getItem().toString());
+ break;
+ }
}//GEN-LAST:event_m_jCategoryItemStateChanged
// Variables declaration - do not modify//GEN-BEGIN:variables
Modified: 1.00/src/main/resources/basic.properties
===================================================================
--- 1.00/src/main/resources/basic.properties 2010-10-08 13:11:28 UTC (rev 847)
+++ 1.00/src/main/resources/basic.properties 2010-10-11 10:12:54 UTC (rev 848)
@@ -1,3 +1,3 @@
-posper.version=1.0-847
+posper.version=${project.version}-${version}
posper.schema=847
posper.build=${buildNumber}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
