[SCM] libjide-oss-java packaging branch, master, updated. debian/3.5.3+dfsg-1-10-g4dab4b6
Markus Koschany
apo at gambaru.de
Sat Apr 13 16:04:42 UTC 2013
The following commit has been merged in the master branch:
commit add4be7bc2feb2273b45a65451ae1bae4fcab6f8
Author: Markus Koschany <apo at gambaru.de>
Date: Sat Apr 13 17:55:17 2013 +0200
Imported Upstream version 3.5.4+dfsg
diff --git a/ChangeLog b/ChangeLog
index 6a0bcbc..a309f07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,26 @@
+2013-04-12 yangxiaoze <yangxiaoze at gmail.com>
+
+ * JIDE Common Layer.iml, README.txt, build.properties, pom.xml:
+ update release info
+
+2013-04-03 frankxu <frank at jidesoft.com>
+
+ * : Merge remote-tracking branch 'origin/master'
+
+2013-03-28 frankxu <frank at jidesoft.com>
+
+ * src/com/jidesoft/popup/JidePopup.java: Common,B,JidePopup,Fixed so
+ that JidePopup#MOVE_ON_MOVED could work correctly with
+ JidePopup#LIGHT_WEIGHT_POPUP,,no
+
+2013-03-17 jidesoft <support at jidesoft.com>
+
+ * src/com/jidesoft/plaf/eclipse/Eclipse3xWindowsUtils.java: update
+ copyright
+
2013-03-14 yangxiaoze <yangxiaoze at gmail.com>
- * build.properties, pom.xml: make files consistant with branch
- number
+ * build.properties, pom.xml: make constant with branch number
2013-03-08 jidesoft <support at jidesoft.com>
diff --git a/JIDE Common Layer.iml b/JIDE Common Layer.iml
index bbcdf3b..3ee1046 100644
--- a/JIDE Common Layer.iml
+++ b/JIDE Common Layer.iml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module MavenProjectsManager.isMavenModule="true" relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <component name="DBNavigator.Module.ConnectionManager">
+ <connections />
+ </component>
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/properties" isTestSource="false" />
diff --git a/README.txt b/README.txt
index 2dc9e40..099ba5e 100644
--- a/README.txt
+++ b/README.txt
@@ -61,4 +61,4 @@ If you just want to use JIDE Common Layer in your project which used Maven, you
<version>3.4.0</version>
</dependency>
-You can specify different versions if you want to use that version. You can find all available version numbers at http://search.maven.org by searching jide-oss.
\ No newline at end of file
+You can specify different versions if you want to use that version. You can find all available version numbers at http://search.maven.org by searching jide-oss.
diff --git a/build.properties b/build.properties
index 6963cbf..2667ea6 100644
--- a/build.properties
+++ b/build.properties
@@ -2,7 +2,7 @@
# USER DEFINED VALUES
#
company_name=JIDE Software, Inc.
-jide_version=3.5.3
+jide_version=3.5.4
base_dir=.
output_dir=${basedir}/classes
diff --git a/pom.xml b/pom.xml
index ba7ca7e..2483bd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<groupId>com.jidesoft</groupId>
<artifactId>jide-oss</artifactId>
<name>JIDE Common Layer</name>
- <version>3.5.3</version>
+ <version>3.5.4</version>
<packaging>jar</packaging>
<description>JIDE Common Layer (Professional Swing Components)</description>
<url>https://github.com/jidesoft/jide-oss</url>
diff --git a/src/com/jidesoft/plaf/eclipse/Eclipse3xWindowsUtils.java b/src/com/jidesoft/plaf/eclipse/Eclipse3xWindowsUtils.java
index d9a056b..c00628c 100644
--- a/src/com/jidesoft/plaf/eclipse/Eclipse3xWindowsUtils.java
+++ b/src/com/jidesoft/plaf/eclipse/Eclipse3xWindowsUtils.java
@@ -1,7 +1,8 @@
-// Decompiled by DJ v3.7.7.81 Copyright 2004 Atanas Neshkov Date: 2006-4-29 10:33:49
-// Home Page : http://members.fortunecity.com/neshkov/dj.html - Check often for new version!
-// Decompiler options: packimports(3)
-// Source File Name: EclipseWindowsUtils.java
+/*
+ * @(#)Eclipse3xWindowsUtils.java 3/17/2013
+ *
+ * Copyright 2002 - 2013 JIDE Software Inc. All rights reserved.
+ */
package com.jidesoft.plaf.eclipse;
diff --git a/src/com/jidesoft/popup/JidePopup.java b/src/com/jidesoft/popup/JidePopup.java
index b88abe8..8494825 100644
--- a/src/com/jidesoft/popup/JidePopup.java
+++ b/src/com/jidesoft/popup/JidePopup.java
@@ -1543,10 +1543,13 @@ public class JidePopup extends JComponent implements Accessible, WindowConstants
}
else if (_popupType == HEAVY_WEIGHT_POPUP) {
p = _window.getLocationOnScreen();
+ // light weight popup followed already but heavy weight popup didn't
+ if (p != null) {
+ p.x += newLocation.x - _actualOwnerLocation.x;
+ p.y += newLocation.y - _actualOwnerLocation.y;
+ }
}
if (p != null) {
- p.x += newLocation.x - _actualOwnerLocation.x;
- p.y += newLocation.y - _actualOwnerLocation.y;
showPopup(p.x, p.y, _actualOwner);
}
}
diff --git a/src/com/jidesoft/utils/DateUtils.java b/src/com/jidesoft/utils/DateUtils.java
index 5651cc3..e26a805 100644
--- a/src/com/jidesoft/utils/DateUtils.java
+++ b/src/com/jidesoft/utils/DateUtils.java
@@ -104,7 +104,7 @@ public class DateUtils {
public static boolean isLastMonth(Calendar cal) {
Calendar today = Calendar.getInstance();
int thisMonth = today.get(Calendar.MONTH);
- if (thisMonth > 1) {
+ if (thisMonth >= 1) {
return today.get(Calendar.YEAR) == cal.get(Calendar.YEAR) && thisMonth - 1 == cal.get(Calendar.MONTH);
}
else {
@@ -121,7 +121,7 @@ public class DateUtils {
public static boolean isLastQuarter(Calendar cal) {
Calendar today = Calendar.getInstance();
int thisQuarter = today.get(Calendar.MONTH) / 3;
- if (thisQuarter > 1) {
+ if (thisQuarter >= 1) {
return today.get(Calendar.YEAR) == cal.get(Calendar.YEAR) && thisQuarter - 1 == cal.get(Calendar.MONTH) / 3;
}
else {
--
libjide-oss-java packaging
More information about the pkg-java-commits
mailing list