midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Revisions 12547, 12549 from /release to /trunk 

Revision: 12547
JAF 1.1.1 -> The JavaBeans Activation Framework 1.1.1 final release is included with the Java SE 6 release

Revision: 12549
Upgrade to JavaMail 1.4.3
Upgrade to SwingX 1.6

Regards,
Tony
This commit is contained in:
tspc 2010-06-14 06:29:41 +00:00
parent 4ee6081e2a
commit 3106b8cbd2
8 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.classpath
View File

@ -20,7 +20,6 @@
<classpathentry kind="src" path="migration/src"/> <classpathentry kind="src" path="migration/src"/>
<classpathentry kind="src" path="posterita/posterita/src/main"/> <classpathentry kind="src" path="posterita/posterita/src/main"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="tools/lib/activation.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/jstl.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/jstl.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/log4j.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/log4j.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/mail.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/mail.jar"/>
@ -48,7 +47,7 @@
<classpathentry exported="true" kind="lib" path="tools/lib/xjavadoc-1.1.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/xjavadoc-1.1.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/xml-apis.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/xml-apis.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/jpedal.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/jpedal.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/swingx-0.9.0.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/swingx-1.6.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/bsh-2.0b5.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/bsh-2.0b5.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/bsh-engine.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/bsh-engine.jar"/>
<classpathentry exported="true" kind="lib" path="tools/lib/groovy-all-1.5.1.jar"/> <classpathentry exported="true" kind="lib" path="tools/lib/groovy-all-1.5.1.jar"/>

2
base/.classpath
View File

@ -74,7 +74,7 @@
<attribute name="org.eclipse.jst.component.dependency" value="../"/> <attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="lib" path="/tools/lib/swingx-0.9.0.jar"> <classpathentry kind="lib" path="/tools/lib/swingx-1.6.jar">
<attributes> <attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/> <attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes> </attributes>

30
base/src/org/adempiere/plaf/AdempiereTaskPaneUI.java
View File

@ -33,8 +33,8 @@ public class AdempiereTaskPaneUI extends BasicTaskPaneUI {
g.setColor(new ColorUIResource(251, 248, 241)); g.setColor(new ColorUIResource(251, 248, 241));
g.fillRect(0, 0, c.getWidth(), c.getHeight()); g.fillRect(0, 0, c.getWidth(), c.getHeight());
g.setColor(new ColorUIResource(251, 248, 241)); g.setColor(new ColorUIResource(251, 248, 241));
g.fillRect(0, ROUND_HEIGHT, c.getWidth(), c.getHeight() g.fillRect(0, getRoundHeight(), c.getWidth(), c.getHeight()
- ROUND_HEIGHT); - getRoundHeight());
} }
paint(g, c); paint(g, c);
} }
@ -49,16 +49,16 @@ public class AdempiereTaskPaneUI extends BasicTaskPaneUI {
protected void paintTitleBackground(JXTaskPane group, Graphics g) { protected void paintTitleBackground(JXTaskPane group, Graphics g) {
if (group.isSpecial()) { if (group.isSpecial()) {
g.setColor(new ColorUIResource(251, 248, 241)); g.setColor(new ColorUIResource(251, 248, 241));
g.fillRoundRect(0, 0, group.getWidth(), ROUND_HEIGHT * 2, g.fillRoundRect(0, 0, group.getWidth(), getRoundHeight() * 2,
ROUND_HEIGHT, ROUND_HEIGHT); getRoundHeight(), getRoundHeight());
g.fillRect(0, ROUND_HEIGHT, group.getWidth(), TITLE_HEIGHT g.fillRect(0, getRoundHeight(), group.getWidth(), getTitleHeight(group)
- ROUND_HEIGHT); - getRoundHeight());
} else { } else {
Paint oldPaint = ((Graphics2D) g).getPaint(); Paint oldPaint = ((Graphics2D) g).getPaint();
GradientPaint gradient = new GradientPaint(0f, 0f, // group.getWidth() GradientPaint gradient = new GradientPaint(0f, 0f, // group.getWidth()
// / 2, // / 2,
new ColorUIResource(241, 239, 222), 0f, // group.getWidth(), new ColorUIResource(241, 239, 222), 0f, // group.getWidth(),
TITLE_HEIGHT, new ColorUIResource(251, 248, 241)); getTitleHeight(group), new ColorUIResource(251, 248, 241));
((Graphics2D) g).setRenderingHint( ((Graphics2D) g).setRenderingHint(
RenderingHints.KEY_COLOR_RENDERING, RenderingHints.KEY_COLOR_RENDERING,
@ -70,19 +70,19 @@ public class AdempiereTaskPaneUI extends BasicTaskPaneUI {
RenderingHints.VALUE_RENDER_QUALITY); RenderingHints.VALUE_RENDER_QUALITY);
((Graphics2D) g).setPaint(gradient); ((Graphics2D) g).setPaint(gradient);
g.fillRoundRect(0, 0, group.getWidth(), ROUND_HEIGHT * 2, g.fillRoundRect(0, 0, group.getWidth(), getRoundHeight() * 2,
ROUND_HEIGHT, ROUND_HEIGHT); getRoundHeight(), getRoundHeight());
g.fillRect(0, ROUND_HEIGHT, group.getWidth(), TITLE_HEIGHT g.fillRect(0, getRoundHeight(), group.getWidth(), getTitleHeight(group)
- ROUND_HEIGHT); - getRoundHeight());
((Graphics2D) g).setPaint(oldPaint); ((Graphics2D) g).setPaint(oldPaint);
} }
Rectangle oldRect = g.getClipBounds(); Rectangle oldRect = g.getClipBounds();
g.setClip(0, 0, group.getWidth(), TITLE_HEIGHT); g.setClip(0, 0, group.getWidth(), getTitleHeight(group));
g.setColor(borderColor); g.setColor(borderColor);
g.drawRoundRect(0, 0, group.getWidth() - 1, TITLE_HEIGHT g.drawRoundRect(0, 0, group.getWidth() - 1, getTitleHeight(group)
+ ROUND_HEIGHT, ROUND_HEIGHT, ROUND_HEIGHT); + getRoundHeight(), getRoundHeight(), getRoundHeight());
g.drawLine(0, TITLE_HEIGHT - 1, group.getWidth(), TITLE_HEIGHT - 1); g.drawLine(0, getTitleHeight(group) - 1, group.getWidth(), getTitleHeight(group) - 1);
g.setClip(oldRect); g.setClip(oldRect);
} }

2
client/.classpath
View File

@ -4,7 +4,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/base"/> <classpathentry kind="src" path="/base"/>
<classpathentry kind="src" path="/tools"/> <classpathentry kind="src" path="/tools"/>
<classpathentry kind="lib" path="/tools/lib/swingx-0.9.0.jar"/> <classpathentry kind="lib" path="/tools/lib/swingx-1.6.jar"/>
<classpathentry kind="lib" path="/tools/lib/groovy-all-1.5.1.jar"/> <classpathentry kind="lib" path="/tools/lib/groovy-all-1.5.1.jar"/>
<classpathentry kind="lib" path="/tools/lib/jcommon-1.0.14.jar"/> <classpathentry kind="lib" path="/tools/lib/jcommon-1.0.14.jar"/>
<classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.11.jar"/> <classpathentry kind="lib" path="/tools/lib/jfreechart-1.0.11.jar"/>

6
client/src/org/compiere/apps/search/InfoProduct.java
View File

@ -343,7 +343,7 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener
tablePanel.setPreferredSize(new Dimension(INFO_WIDTH, SCREEN_HEIGHT > 600 ? 255 : 110)); tablePanel.setPreferredSize(new Dimension(INFO_WIDTH, SCREEN_HEIGHT > 600 ? 255 : 110));
tablePanel.add(jTab); tablePanel.add(jTab);
warehouseStockPanel.setExpanded(false); warehouseStockPanel.setCollapsed(true);
warehouseStockPanel.add(tablePanel); warehouseStockPanel.add(tablePanel);
this.addonPanel.add(warehouseStockPanel); this.addonPanel.add(warehouseStockPanel);
@ -355,7 +355,7 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener
new BigDecimal(pickWarehouse.getValue().toString()).intValue(), new BigDecimal(pickWarehouse.getValue().toString()).intValue(),
new BigDecimal(pickPriceList.getValue().toString()).intValue() new BigDecimal(pickPriceList.getValue().toString()).intValue()
); );
warehouseStockPanel.setExpanded(true); warehouseStockPanel.setCollapsed(false);
} }
}); });
@ -367,7 +367,7 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener
new BigDecimal(pickWarehouse.getValue().toString()).intValue(), new BigDecimal(pickWarehouse.getValue().toString()).intValue(),
new BigDecimal(pickPriceList.getValue().toString()).intValue() new BigDecimal(pickPriceList.getValue().toString()).intValue()
); );
warehouseStockPanel.setExpanded(true); warehouseStockPanel.setCollapsed(false);
} }
}); });
//End - fer_luck @ centuryon //End - fer_luck @ centuryon

2
looks/.classpath
View File

@ -3,7 +3,7 @@
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/tools/lib/looks-2.0.4.jar"/> <classpathentry kind="lib" path="/tools/lib/looks-2.0.4.jar"/>
<classpathentry kind="lib" path="/tools/lib/swingx-0.9.0.jar"/> <classpathentry kind="lib" path="/tools/lib/swingx-1.6.jar"/>
<classpathentry kind="lib" path="/tools/lib/jnlp.jar"/> <classpathentry kind="lib" path="/tools/lib/jnlp.jar"/>
<classpathentry kind="output" path="build"/> <classpathentry kind="output" path="build"/>
</classpath> </classpath>

7
tools/.classpath
View File

@ -36,7 +36,7 @@
<attribute name="org.eclipse.jst.component.dependency" value="../"/> <attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry exported="true" kind="lib" path="lib/swingx-0.9.0.jar"> <classpathentry exported="true" kind="lib" path="lib/swingx-1.6.jar">
<attributes> <attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/> <attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes> </attributes>
@ -62,11 +62,6 @@
<attribute name="org.eclipse.jst.component.dependency" value="../"/> <attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry exported="true" kind="lib" path="lib/activation.jar">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/mail.jar"> <classpathentry exported="true" kind="lib" path="lib/mail.jar">
<attributes> <attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/> <attribute name="org.eclipse.jst.component.dependency" value="../"/>

5
tools/build.xml
View File

@ -342,9 +342,6 @@
<include name="it/**" /> <include name="it/**" />
</fileset> </fileset>
<!-- Mail --> <!-- Mail -->
<zipfileset src="lib/activation.jar">
<patternset refid="manifest.exclude" />
</zipfileset>
<zipfileset src="lib/mail.jar"> <zipfileset src="lib/mail.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>
@ -433,7 +430,7 @@
<zipfileset src="lib/iText-2.1.7.jar"> <zipfileset src="lib/iText-2.1.7.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>
<zipfileset src="lib/swingx-0.9.0.jar"> <zipfileset src="lib/swingx-1.6.jar">
<patternset refid="manifest.exclude" /> <patternset refid="manifest.exclude" />
</zipfileset> </zipfileset>
<!-- JMS --> <!-- JMS -->