Sync from SUSE:SLFO:Main opa-fmgui revision 8d6c0ed6b6ea3e087ab68d8ca60b5774

.gitattributes

@@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text

_service

@@ -0,0 +1,24 @@
+<services>
+  <service name="tar_scm" mode="disabled">
+    <param name="scm">git</param>
+    <param name="url">https://github.com/01org/opa-fmgui.git</param>
+    <param name="package-meta">no</param>
+    <param name="exclude">.git</param>
+    <param name="filename">opa-fmgui</param>
+    <param name="version">10.1.0.0.115</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
+    <param name="versionrewrite-replacement">\1</param>
+    <param name="revision">814f72fc665e4143a25e3c685e784d2006898603</param>
+  </service>
+  <service name="recompress" mode="disabled">
+    <param name="file">opa-fmgui*.tar</param>
+    <param name="compression">gz</param>
+  </service>
+
+  <service name="extract_file" mode="disabled">
+    <param name="files">
+      */*.patch
+    </param>
+    <param name="archive">opa-fmgui-*.tar.gz</param>
+  </service>
+</services>

manifest-version.patch

@@ -0,0 +1,14 @@
+diff -Npru a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
+--- a/src/META-INF/MANIFEST.MF	2017-03-19 14:43:56.476594823 -0400
++++ b/src/META-INF/MANIFEST.MF	2017-03-19 14:44:32.354453193 -0400
+@@ -6,8 +6,8 @@ Implementation-Title: Intel Fabric Manag
+ Implementation-Vendor: Intel Corporation
+ Implementation-Version: 10.0.0.DEV
+ Schema-Version: 37
+-Intel-OPAFM-Version: 10.1.0.0.112
+-Intel-Build-Id: 10_1_0_0_112
++Intel-OPAFM-Version: 10.1.0.0.115
++Intel-Build-Id: 10_1_0_0_115
+ Intel-Build-Date: 2016-05-14 08:54:41
+ Main-Class: com.intel.stl.main.FMGuiApp
+ 

opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch

@@ -0,0 +1,28 @@
+diff --git build.xml build.xml
+index a7f6209..84f4c59 100644
+--- build.xml
++++ build.xml
+@@ -1,4 +1,4 @@
+-<project name ="FMGUI" default="build" basedir=".">
++<project name ="FMGUI" default="buildOPA" basedir=".">
+ 	<property name="src" value="src"/>
+ 	<property name="target" value="target"/>
+     <property name="resources" value="resources"/>
+@@ -18,7 +18,7 @@
+         </condition>
+ 	</target>
+ 	<target name="compile" description="Compiles the Fabric Manager GUI application">
+-	    <javac  srcdir="${src}" destdir="${target}/classes"
++	    <javac target="1.8" srcdir="${src}" destdir="${target}/classes"
+ 			        encoding="windows-1252"
+ 				    debug="true"
+ 		    		fork="yes"
+@@ -53,7 +53,7 @@
+ 	<target name="clear" description="Clears build files">
+ 	    <delete dir="${target}"/>
+ 	</target>
+-	<target name="build" description="Builds the Fabric Manager GUI application" depends="init,compile,createJar">
++	<target name="buildOPA" description="Builds the Fabric Manager GUI application" depends="init,compile,createJar">
+ 		<echo message="Fabric Manager GUI application has been built: ${target}/${opa-fmgui.app.jar}"/>
+ 	</target>
+ </project>

opa-fmgui.changes

@@ -0,0 +1,167 @@
+-------------------------------------------------------------------
+Tue Oct 31 22:45:47 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Modified patch:
+  * opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch
+    + Build with java source/target levels 8
+    + Fixes building with JDK21
+
+-------------------------------------------------------------------
+Mon Apr 11 13:00:04 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Do not use the vulnerable log4j-1.2.14, but use the maintained
+  fork reaload4j-1.2.20 that receives security updates
+
+-------------------------------------------------------------------
+Mon Apr 11 12:46:41 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Fix building with JDK17
+  * This fixes build in Factory and still allows building on other
+    distributions
+  * Do not use gradle for build, but build gritty using simple
+    javac/jar combo and the rest using the ant build.xml file
+  * Add jaxb-api-2.3.1.jar and javax.activation-api-1.2.0.jar
+    to allow building with JDK versions that do not include the
+    JavaEE modules
+  * Remove swingx-testsupport-1.6.5.jar, since that one is only
+    meant to be used for testing the swingx itself and not for
+    distribution
+- Removed patches:
+  * gradle-use_local_repo.patch
+    + not needed when gradle is not used for building
+  * opa-fmgui-force-loading-java.xml.bind-for-JDK9.patch
+    + not needed since the relevant JavaEE modules are on the
+      classpath
+
+-------------------------------------------------------------------
+Wed Oct 10 07:56:00 UTC 2018 - nmoreychaisemartin@suse.com
+
+- Update gradle to 4.10.2 for JDK11 support
+
+-------------------------------------------------------------------
+Fri Apr 27 13:16:49 UTC 2018 - nmoreychaisemartin@suse.com
+
+- Add opa-fmgui-force-loading-java.xml.bind-for-JDK9.patch to allow
+  opa-fmgui to run with JDK9+ (bsc#1090589)
+
+-------------------------------------------------------------------
+Wed Nov 22 15:07:26 UTC 2017 - mgorse@suse.com
+
+- Remove libgnome from BuildRequires; appears to be unused
+  (boo#1067727).
+
+-------------------------------------------------------------------
+Mon Nov 13 10:14:30 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Upgrade gradle to 4.3.1 to support JDK 9.0.1
+
+-------------------------------------------------------------------
+Mon Sep 25 14:41:13 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Update embedded gradle binaries to 3.2 to support JDK9
+- Add opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch to fix
+  compilation with JDK9
+
+-------------------------------------------------------------------
+Sun Sep 10 23:38:22 UTC 2017 - jengelh@inai.de
+
+- Replace old $RPM_* shell vars by macros. Fix RPM group.
+
+-------------------------------------------------------------------
+Tue Sep  5 14:32:45 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Update _service to allow auto updates from github
+
+-------------------------------------------------------------------
+Thu Jun  8 10:08:04 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Add _service
+- Auto extract patch from upstream tar
+- Add manifest-version.patch from upstream to fix internal
+  version number.
+
+-------------------------------------------------------------------
+Wed May 17 09:28:18 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Add BuildRequires to hicolor-icon-theme in order to enable
+ %icon_theme_cache_post/postun macros
+
+-------------------------------------------------------------------
+Wed Apr  5 08:46:46 UTC 2017 - josef.moellers@suse.com
+
+- Upgrade to Version 10.1.0.0
+  This obsoletes Patches
+  2:opa-fmgui-desktopfile-without-binary.patch
+  and
+  4:opa-fmgui-fix-detection-of-OpenJDK.patch
+  Added pre-built gradle-2.9 for build phase.
+  Replaced wrong Sun licence by GPLv2-CE as given on
+  https://javahelp.java.net/license.txt
+  [FATE#321477, bsc#989769]
+
+-------------------------------------------------------------------
+Tue Oct  4 18:35:02 CEST 2016 - ndas@suse.de
+
+- Applied patch from Intel to search for 'version' instead of 'java version'
+  so the openJDK can be detected at runtime(bsc#989769).
+  [+ opa-fmgui-fix-detection-of-OpenJDK.patch]
+
+-------------------------------------------------------------------
+Wed Jul 27 12:39:49 CEST 2016 - ndas@suse.de
+
+- Applied patch from Intel and modified the spec file as required(bsc#989769).
+  [+opa-fmgui-intel-manifest-license.patch]
+
+* opa-fmgui/opa-fmgui.spec
+--------------------------
+  - Updated Version/Release numbers to match opa-fmgui
+  - Changed app folder and name to match installed application name "opa-fmgui"
+  - Removed references to /usr/local/bin; only using /usr/bin
+  - Installed jar files in lib/ folder with correct permissions for all users, not just root
+  - Added reference to patch file to make corrections
+
+* opa-fmgui/install/fmgui.sh
+----------------------------
+  - Updated to reference the new folder /usr/share/java/opa-fmgui where the fmgui.jar is stored
+
+* opa-fmgui/src/META-INF/MANIFEST.MF
+------------------------------------
+  - Updated to correct reference to Gritty library (gritty.jar not gritty-0.02.jar)
+
+* opa-fmgui/util/postsetup.sh
+-----------------------------
+  - Fabric.directory was copied from /usr/local/share/desktop-directories, which doesn't exist. Now copying from /usr/share/desktop-directories
+
+* License Files
+---------------
+    - Added all 3rd party license files since their jar files are being packaged as required by Intel Legal
+    gritty_license.txt
+    hibernate_license.txt
+    hsqldb_license.txt
+    javahelp_license.html
+    javamail_license.txt
+    jfreechart_license.txt
+    jgraphx_license.txt
+    jsch_license.txt
+    logback_license.txt
+    mbassador_license.txt
+    slf4j_license.txt
+    swingx_license.txt
+
+-------------------------------------------------------------------
+Thu Jul 21 13:50:53 CEST 2016 - ndas@suse.de
+
+- Corrected the version in spec file(bsc#989769).
+
+-------------------------------------------------------------------
+Wed Jun  1 15:42:13 CEST 2016 - ndas@suse.de
+
+- Added mlocate and jre as depended package(bsc#982579).
+- Fixed desktopfile-without-binary rpm warning.
+  [+opa-fmgui-desktopfile-without-binary.patch]
+
+-------------------------------------------------------------------
+Tue Apr 12 15:17:02 UTC 2016 - nirmoy.das@suse.com
+
+- Initial package version 10_0_0_0_2) for fate#319231
+

opa-fmgui.spec

@@ -0,0 +1,182 @@
+#
+# spec file for package opa-fmgui
+#
+# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2015 Intel Corporation
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%define git_ver %{nil}
+%define name opa-fmgui
+%define appdir .
+%define appfolder opa-fmgui
+%define appjar opa-fmgui.jar
+%define _binary_payload w9.gzdio
+%define gradle_version	4.10.2
+Name:           opa-fmgui
+Version:        10.1.0.0.115
+Release:        0
+Summary:        Fabric Manager Graphical User Interface
+License:        BSD-3-Clause AND LGPL-2.0-or-later
+Group:          Productivity/Clustering/Computing
+URL:            https://www.intel.com/
+Source0:        %{name}-%{version}%{git_ver}.tar.gz
+Source1:        antlr-2.7.7.jar
+Source2:        dom4j-1.6.1.jar
+Source3:        hibernate-commons-annotations-4.0.4.Final.jar
+Source4:        hibernate-core-4.3.5.Final.jar
+Source5:        hibernate-entitymanager-4.3.5.Final.jar
+Source6:        hibernate-jpa-2.1-api-1.0.0.Final.jar
+Source7:        hsqldb-2.3.2.jar
+Source8:        jandex-1.1.0.Final.jar
+Source9:        javahelp-2.0.05.jar
+Source10:       javassist-3.18.1-GA.jar
+Source11:       javax.activation-api-1.2.0.jar
+Source12:       javax.mail-1.5.2.jar
+Source13:       jaxb-api-2.3.1.jar
+Source14:       jboss-logging-3.1.3.GA.jar
+Source15:       jboss-logging-annotations-1.2.0.Beta1.jar
+Source16:       jboss-transaction-api_1.2_spec-1.0.0.Final.jar
+Source17:       jcommon-1.0.21.jar
+Source18:       jfreechart-1.0.17.jar
+Source19:       jgraphx-3.6.0.0.jar
+Source20:       jsch-0.1.53.jar
+Source21:       log4j-over-slf4j-1.7.7.jar
+Source22:       logback-classic-1.1.2.jar
+Source23:       logback-core-1.1.2.jar
+Source24:       mbassador-1.2.4.2.jar
+Source25:       reload4j-1.2.20.jar
+Source26:       slf4j-api-1.7.7.jar
+Source27:       swingx-all-1.6.5.jar
+Source28:       swingx-action-1.6.5.jar
+Source29:       swingx-autocomplete-1.6.5.jar
+Source30:       swingx-beaninfo-1.6.5.jar
+Source31:       swingx-common-1.6.5.jar
+Source32:       swingx-core-1.6.5.jar
+Source33:       swingx-graphics-1.6.5.jar
+Source34:       swingx-mavensupport-1.6.5.jar
+Source35:       swingx-painters-1.6.5.jar
+Source36:       swingx-plaf-1.6.5.jar
+Patch0:         opa-fmgui-intel-manifest-license.patch
+# Patch auto extracted by service
+Patch1:         stl-14927-jgraphx-update.patch
+Patch2:         manifest-version.patch
+Patch3:         opa-fmgui-fix-build-for-JDK9-Gradle-3.2.patch
+BuildRequires:  ant
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  java-devel >= 1.8
+BuildRequires:  openssl
+BuildRequires:  unzip
+BuildRequires:  update-desktop-files
+BuildRequires:  wget
+Requires:       jre >= 1.8
+Requires:       mlocate
+# BuildRequires:  gradle
+BuildArch:      noarch
+
+%description
+FMGUI is the Fabric Manager Graphical User Interface.  It can be run by invoking the Bash
+script fmgui.
+
+%prep
+%setup -q -n %{name}-%{version}%{git_ver}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3
+
+%build
+mkdir -p lib
+cp %{_sourcedir}/*.jar lib/
+
+pushd gritty
+mkdir -p classes
+javac -d classes -source 8 -target 8 -cp %{SOURCE20}:%{SOURCE25} $(find . -name \*.java | xargs)
+jar -cf ../lib/gritty.jar -C classes .
+popd
+
+%{ant}
+
+%install
+mkdir -p %{buildroot}%{_javadir}/%{appfolder}
+mkdir -p %{buildroot}%{_javadir}/%{appfolder}/lib
+mkdir -p %{buildroot}%{_javadir}/%{appfolder}/help
+mkdir -p %{buildroot}%{_javadir}/%{appfolder}/util
+mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_sysconfdir}/profile.d
+mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/
+# mkdir -p %%{buildroot}/%%{_datadir}/doc/%%{name}/licenses
+mkdir -p %{buildroot}/%{_datadir}/icons/hicolor
+mkdir -p  %{buildroot}/%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/desktop-directories
+
+install -m 755 %{appdir}/%{appjar} %{buildroot}%{_javadir}/%{appfolder}
+
+# cp %%{appdir}/LICENSE %%{buildroot}/%%{_datadir}/doc/%%{name}/
+# cp  %%{appdir}/THIRD-PARTY-README %%{buildroot}/%%{_datadir}/doc/%%{name}/
+# cp  %%{appdir}/Third_Party_Copyright_Notices_and_Licenses %%{buildroot}/%%{_datadir}/doc/%%{name}/
+# cp  -r %%{appdir}/licenses %%{buildroot}/%%{_datadir}/doc/%%{name}/
+
+install -m 644 -pDt %{buildroot}/%{_javadir}/%{appfolder}/lib %{appdir}/lib/*
+cp -a %{appdir}/target/help/* %{buildroot}%{_javadir}/%{appfolder}/help
+cp %{appdir}/help/*.html %{buildroot}%{_javadir}/%{appfolder}/help
+#cp %%{appdir}/help/LICENSE %%{buildroot}%%{_javadir}/%%{appfolder}/help
+install -m 755  %{appdir}/util/fmguiclear.sh %{buildroot}%{_javadir}/%{appfolder}/util
+install -m 755  %{appdir}/util/postsetup.sh %{buildroot}%{_javadir}/%{appfolder}/util
+cp -a %{appdir}/util/ClearFMGUICache.desktop %{buildroot}%{_javadir}/%{appfolder}/util
+
+install -m 755 %{appdir}/install/opa-fmgui.sh %{buildroot}%{_bindir}/opa-fmgui
+
+#for fmgui.desktop
+cp -a  %{appdir}/install/fmguivars.sh %{buildroot}/%{_sysconfdir}/profile.d
+cp -a %{appdir}/install/fmgui.desktop %{buildroot}
+cp -a %{appdir}/install/Fabric.directory %{buildroot}%{_datadir}/desktop-directories
+cp -a %{appdir}/install/images/* %{buildroot}/%{_datadir}/icons/hicolor
+cp -a %{appdir}/install/Fabric.menu %{buildroot}/%{_sysconfdir}/xdg/menus/applications-merged
+
+%suse_update_desktop_file -i fmgui Utility Filesystem
+
+rm %{buildroot}/fmgui.desktop
+
+%post
+%desktop_database_post
+%icon_theme_cache_post
+
+%postun
+%desktop_database_postun
+%icon_theme_cache_postun
+
+%files
+%doc README THIRD-PARTY-README Third_Party_Copyright_Notices_and_Licenses
+%license LICENSE gritty/gritty_license.txt
+%dir %{_sysconfdir}/xdg/menus
+%dir %{_datadir}/desktop-directories
+%dir %{_datadir}/doc/opa-fmgui
+%dir %{_sysconfdir}/xdg/menus/applications-merged
+
+%{_javadir}/%{appfolder}
+%{_bindir}/opa-fmgui
+%{_datadir}/applications/*.desktop
+# %%{_datadir}/doc/%%{name}/*
+%{_datadir}/desktop-directories/Fabric.directory
+%{_datadir}/icons/hicolor
+
+# %%license %%{_datadir}/doc/opa-fmgui/LICENSE
+# %%license %%{_datadir}/doc/opa-fmgui/licenses/*
+
+%config %{_sysconfdir}/xdg/menus/applications-merged/Fabric.menu
+%config %{_sysconfdir}/profile.d/fmguivars.sh
+
+%changelog

stl-14927-jgraphx-update.patch

@@ -0,0 +1,774 @@
+diff -cr 10.1/src/com/intel/stl/ui/network/TopGraphComponent.java 10.4/src/com/intel/stl/ui/network/TopGraphComponent.java
+*** 10.1/src/com/intel/stl/ui/network/TopGraphComponent.java	2017-01-20 04:40:10.053889049 -0500
+--- 10.4/src/com/intel/stl/ui/network/TopGraphComponent.java	2017-01-20 04:42:31.002896219 -0500
+***************
+*** 1,9 ****
+  /**
+   * Copyright (c) 2015, Intel Corporation
+!  * 
+   * Redistribution and use in source and binary forms, with or without
+   * modification, are permitted provided that the following conditions are met:
+!  * 
+   *     * Redistributions of source code must retain the above copyright notice,
+   *       this list of conditions and the following disclaimer.
+   *     * Redistributions in binary form must reproduce the above copyright
+--- 1,9 ----
+  /**
+   * Copyright (c) 2015, Intel Corporation
+!  *
+   * Redistribution and use in source and binary forms, with or without
+   * modification, are permitted provided that the following conditions are met:
+!  *
+   *     * Redistributions of source code must retain the above copyright notice,
+   *       this list of conditions and the following disclaimer.
+   *     * Redistributions in binary form must reproduce the above copyright
+***************
+*** 12,18 ****
+   *     * Neither the name of Intel Corporation nor the names of its contributors
+   *       may be used to endorse or promote products derived from this software
+   *       without specific prior written permission.
+!  * 
+   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+--- 12,18 ----
+   *     * Neither the name of Intel Corporation nor the names of its contributors
+   *       may be used to endorse or promote products derived from this software
+   *       without specific prior written permission.
+!  *
+   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+***************
+*** 73,80 ****
+  public class TopGraphComponent extends mxGraphComponent {
+      private static final long serialVersionUID = -3168649345200765940L;
+  
+!     private static final Logger log = LoggerFactory
+!             .getLogger(TopGraphComponent.class);
+  
+      private boolean graphBuffered = true;
+  
+--- 73,80 ----
+  public class TopGraphComponent extends mxGraphComponent {
+      private static final long serialVersionUID = -3168649345200765940L;
+  
+!     private static final Logger log =
+!             LoggerFactory.getLogger(TopGraphComponent.class);
+  
+      private boolean graphBuffered = true;
+  
+***************
+*** 100,106 ****
+  
+      /**
+       * Description:
+!      * 
+       * @param graph
+       */
+      public TopGraphComponent(IBackgroundService updateService, TopGraph graph) {
+--- 100,106 ----
+  
+      /**
+       * Description:
+!      *
+       * @param graph
+       */
+      public TopGraphComponent(IBackgroundService updateService, TopGraph graph) {
+***************
+*** 148,154 ****
+  
+      /*
+       * (non-Javadoc)
+!      * 
+       * @see com.mxgraph.swing.mxGraphComponent#createGraphControl()
+       */
+      @Override
+--- 148,154 ----
+  
+      /*
+       * (non-Javadoc)
+!      *
+       * @see com.mxgraph.swing.mxGraphComponent#createGraphControl()
+       */
+      @Override
+***************
+*** 173,179 ****
+  
+      /*
+       * (non-Javadoc)
+!      * 
+       * @see com.mxgraph.swing.mxGraphComponent#createHandlers()
+       */
+      @Override
+--- 173,179 ----
+  
+      /*
+       * (non-Javadoc)
+!      *
+       * @see com.mxgraph.swing.mxGraphComponent#createHandlers()
+       */
+      @Override
+***************
+*** 216,222 ****
+  
+      /*
+       * (non-Javadoc)
+!      * 
+       * @see com.mxgraph.swing.mxGraphComponent#createPanningHandler()
+       */
+      @Override
+--- 216,222 ----
+  
+      /*
+       * (non-Javadoc)
+!      *
+       * @see com.mxgraph.swing.mxGraphComponent#createPanningHandler()
+       */
+      @Override
+***************
+*** 226,232 ****
+  
+      /*
+       * (non-Javadoc)
+!      * 
+       * @see com.mxgraph.swing.mxGraphComponent#createGraphHandler()
+       */
+      @Override
+--- 226,232 ----
+  
+      /*
+       * (non-Javadoc)
+!      *
+       * @see com.mxgraph.swing.mxGraphComponent#createGraphHandler()
+       */
+      @Override
+***************
+*** 236,242 ****
+  
+      /*
+       * (non-Javadoc)
+!      * 
+       * @see com.mxgraph.swing.mxGraphComponent#createSelectionCellsHandler()
+       */
+      @Override
+--- 236,242 ----
+  
+      /*
+       * (non-Javadoc)
+!      *
+       * @see com.mxgraph.swing.mxGraphComponent#createSelectionCellsHandler()
+       */
+      @Override
+***************
+*** 246,252 ****
+  
+      /*
+       * (non-Javadoc)
+!      * 
+       * @see com.mxgraph.swing.mxGraphComponent#installDoubleClickHandler()
+       */
+      @Override
+--- 246,252 ----
+  
+      /*
+       * (non-Javadoc)
+!      *
+       * @see com.mxgraph.swing.mxGraphComponent#installDoubleClickHandler()
+       */
+      @Override
+***************
+*** 255,264 ****
+  
+      /*
+       * (non-Javadoc)
+!      * 
+!      * @see
+!      * com.mxgraph.swing.mxGraphComponent#isPanningEvent(java.awt.event.MouseEvent
+!      * )
+       */
+      @Override
+      public boolean isPanningEvent(MouseEvent event) {
+--- 255,263 ----
+  
+      /*
+       * (non-Javadoc)
+!      *
+!      * @see com.mxgraph.swing.mxGraphComponent#isPanningEvent(java.awt.event.
+!      * MouseEvent )
+       */
+      @Override
+      public boolean isPanningEvent(MouseEvent event) {
+***************
+*** 267,276 ****
+  
+      /*
+       * (non-Javadoc)
+!      * 
+!      * @see
+!      * com.mxgraph.swing.mxGraphComponent#createHandler(com.mxgraph.view.mxCellState
+!      * )
+       */
+      @Override
+      public mxCellHandler createHandler(mxCellState state) {
+--- 266,274 ----
+  
+      /*
+       * (non-Javadoc)
+!      *
+!      * @see com.mxgraph.swing.mxGraphComponent#createHandler(com.mxgraph.view.
+!      * mxCellState )
+       */
+      @Override
+      public mxCellHandler createHandler(mxCellState state) {
+***************
+*** 284,290 ****
+  
+      /*
+       * (non-Javadoc)
+!      * 
+       * @see com.mxgraph.swing.mxGraphComponent#selectRegion(java.awt.Rectangle,
+       * java.awt.event.MouseEvent)
+       */
+--- 282,288 ----
+  
+      /*
+       * (non-Javadoc)
+!      *
+       * @see com.mxgraph.swing.mxGraphComponent#selectRegion(java.awt.Rectangle,
+       * java.awt.event.MouseEvent)
+       */
+***************
+*** 303,309 ****
+  
+      /*
+       * (non-Javadoc)
+!      * 
+       * @see com.mxgraph.swing.mxGraphComponent#getCellAt(int, int, boolean,
+       * java.lang.Object)
+       */
+--- 301,307 ----
+  
+      /*
+       * (non-Javadoc)
+!      *
+       * @see com.mxgraph.swing.mxGraphComponent#getCellAt(int, int, boolean,
+       * java.lang.Object)
+       */
+***************
+*** 348,354 ****
+          }
+  
+          if (parent != null) {
+!             Point previousTranslate = canvas.getTranslate();
+              double previousScale = canvas.getScale();
+  
+              try {
+--- 346,352 ----
+          }
+  
+          if (parent != null) {
+!             mxPoint previousTranslate = canvas.getTranslate();
+              double previousScale = canvas.getScale();
+  
+              try {
+***************
+*** 366,374 ****
+                      }
+  
+                      Object cell = model.getChildAt(parent, i);
+!                     Object result =
+!                             findCellAt(id, x, y, hitSwimlaneContent, cell,
+!                                     vertex);
+  
+                      if (result != null) {
+                          return result;
+--- 364,371 ----
+                      }
+  
+                      Object cell = model.getChildAt(parent, i);
+!                     Object result = findCellAt(id, x, y, hitSwimlaneContent,
+!                             cell, vertex);
+  
+                      if (result != null) {
+                          return result;
+***************
+*** 376,393 ****
+                              && (vertex == model.isVertex(cell))) {
+                          mxCellState state = view.getState(cell);
+  
+!                         if (state != null
+!                                 && canvas.intersects(this, hit, state)
+                                  && (!graph.isSwimlane(cell)
+!                                         || hitSwimlaneContent || (transparentSwimlaneContent && !canvas
+!                                         .hitSwimlaneContent(this, state, x, y)))) {
+                              return cell;
+                          }
+                      }
+                  }
+              } finally {
+                  canvas.setScale(previousScale);
+!                 canvas.setTranslate(previousTranslate.x, previousTranslate.y);
+              }
+          }
+  
+--- 373,392 ----
+                              && (vertex == model.isVertex(cell))) {
+                          mxCellState state = view.getState(cell);
+  
+!                         if (state != null && canvas.intersects(this, hit, state)
+                                  && (!graph.isSwimlane(cell)
+!                                         || hitSwimlaneContent
+!                                         || (transparentSwimlaneContent
+!                                                 && !canvas.hitSwimlaneContent(
+!                                                         this, state, x, y)))) {
+                              return cell;
+                          }
+                      }
+                  }
+              } finally {
+                  canvas.setScale(previousScale);
+!                 canvas.setTranslate(previousTranslate.getX(),
+!                         previousTranslate.getY());
+              }
+          }
+  
+***************
+*** 396,402 ****
+  
+      /*
+       * (non-Javadoc)
+!      * 
+       * @see
+       * com.mxgraph.swing.mxGraphComponent#setGraph(com.mxgraph.view.mxGraph)
+       */
+--- 395,401 ----
+  
+      /*
+       * (non-Javadoc)
+!      *
+       * @see
+       * com.mxgraph.swing.mxGraphComponent#setGraph(com.mxgraph.view.mxGraph)
+       */
+***************
+*** 429,437 ****
+                          selectionListener);
+              }
+          } else {
+!             throw new IllegalArgumentException("graph "
+!                     + value.getClass().getName() + " is not "
+!                     + TopGraph.class.getName());
+          }
+      }
+  
+--- 428,436 ----
+                          selectionListener);
+              }
+          } else {
+!             throw new IllegalArgumentException(
+!                     "graph " + value.getClass().getName() + " is not "
+!                             + TopGraph.class.getName());
+          }
+      }
+  
+***************
+*** 466,472 ****
+  
+      /**
+       * Description:
+!      * 
+       * @param point
+       */
+      public void zoomIn(Point point) {
+--- 465,471 ----
+  
+      /**
+       * Description:
+!      *
+       * @param point
+       */
+      public void zoomIn(Point point) {
+***************
+*** 475,481 ****
+  
+      /**
+       * Description:
+!      * 
+       * @param point
+       */
+      public void zoomOut(Point point) {
+--- 474,480 ----
+  
+      /**
+       * Description:
+!      *
+       * @param point
+       */
+      public void zoomOut(Point point) {
+***************
+*** 489,501 ****
+                  double newScale = view.getScale() * factor;
+                  if (Math.abs(newScale - view.getScale()) > 1e-4
+                          && newScale > 1e-3) {
+!                     mxPoint translate =
+!                             point == null ? new mxPoint() : getTranslate(point,
+!                                     view.getScale(), newScale);
+                      mxPoint oldTranslate = view.getTranslate();
+!                     view.scaleAndTranslate(newScale, translate.getX()
+!                             + oldTranslate.getX(), translate.getY()
+!                             + oldTranslate.getY());
+                      restartTimer();
+                      // System.out.println("ScaleAndTranslate " + view.getScale()
+                      // + " "
+--- 488,499 ----
+                  double newScale = view.getScale() * factor;
+                  if (Math.abs(newScale - view.getScale()) > 1e-4
+                          && newScale > 1e-3) {
+!                     mxPoint translate = point == null ? new mxPoint()
+!                             : getTranslate(point, view.getScale(), newScale);
+                      mxPoint oldTranslate = view.getTranslate();
+!                     view.scaleAndTranslate(newScale,
+!                             translate.getX() + oldTranslate.getX(),
+!                             translate.getY() + oldTranslate.getY());
+                      restartTimer();
+                      // System.out.println("ScaleAndTranslate " + view.getScale()
+                      // + " "
+***************
+*** 505,511 ****
+          });
+      }
+  
+!     protected mxPoint getTranslate(Point point, double oldScale, double newScale) {
+          int x = point.x;
+          int y = point.y;
+          double f = (newScale - oldScale) / (oldScale * newScale);
+--- 503,510 ----
+          });
+      }
+  
+!     protected mxPoint getTranslate(Point point, double oldScale,
+!             double newScale) {
+          int x = point.x;
+          int y = point.y;
+          double f = (newScale - oldScale) / (oldScale * newScale);
+***************
+*** 529,536 ****
+              double oldScale = view.getScale();
+              mxPoint trans = view.getTranslate();
+              // zoom to fit selected area
+!             view.scaleAndTranslate(oldScale * newScale, -rect.x / oldScale
+!                     + trans.getX(), -rect.y / oldScale + trans.getY());
+              // System.out.println("ScaleAndTranslate " + view.getScale()
+              // + " "
+              // + view.getTranslate());
+--- 528,536 ----
+              double oldScale = view.getScale();
+              mxPoint trans = view.getTranslate();
+              // zoom to fit selected area
+!             view.scaleAndTranslate(oldScale * newScale,
+!                     -rect.x / oldScale + trans.getX(),
+!                     -rect.y / oldScale + trans.getY());
+              // System.out.println("ScaleAndTranslate " + view.getScale()
+              // + " "
+              // + view.getTranslate());
+***************
+*** 539,554 ****
+  
+      protected void restartTimer() {
+          if (repaintTimer == null) {
+!             repaintTimer =
+!                     new Timer(UIConstants.UPDATE_TIME / 2,
+!                             new ActionListener() {
+!                                 @Override
+!                                 public void actionPerformed(ActionEvent e) {
+!                                     if (repaintTimer != null) {
+!                                         updateGraph();
+!                                     }
+!                                 }
+!                             });
+              repaintTimer.setRepeats(false);
+          }
+          repaintTimer.restart();
+--- 539,553 ----
+  
+      protected void restartTimer() {
+          if (repaintTimer == null) {
+!             repaintTimer = new Timer(UIConstants.UPDATE_TIME / 2,
+!                     new ActionListener() {
+!                         @Override
+!                         public void actionPerformed(ActionEvent e) {
+!                             if (repaintTimer != null) {
+!                                 updateGraph();
+!                             }
+!                         }
+!                     });
+              repaintTimer.setRepeats(false);
+          }
+          repaintTimer.restart();
+***************
+*** 567,573 ****
+  
+          /**
+           * Description:
+!          * 
+           * @param graphComponent
+           */
+          public PanningHandler(mxGraphComponent graphComponent) {
+--- 566,572 ----
+  
+          /**
+           * Description:
+!          *
+           * @param graphComponent
+           */
+          public PanningHandler(mxGraphComponent graphComponent) {
+***************
+*** 576,582 ****
+  
+          /*
+           * (non-Javadoc)
+!          * 
+           * @see
+           * com.mxgraph.swing.handler.mxPanningHandler#mousePressed(java.awt.
+           * event.MouseEvent)
+--- 575,581 ----
+  
+          /*
+           * (non-Javadoc)
+!          *
+           * @see
+           * com.mxgraph.swing.handler.mxPanningHandler#mousePressed(java.awt.
+           * event.MouseEvent)
+***************
+*** 584,590 ****
+          @Override
+          public void mousePressed(final MouseEvent e) {
+              if (isEnabled() && !e.isConsumed()
+!                     && graphComponent.isPanningEvent(e) && !e.isPopupTrigger()) {
+                  graphControl.setCursor(mxGraphHandler.FOLD_CURSOR);
+                  updateService.submit(new Runnable() {
+                      @Override
+--- 583,590 ----
+          @Override
+          public void mousePressed(final MouseEvent e) {
+              if (isEnabled() && !e.isConsumed()
+!                     && graphComponent.isPanningEvent(e)
+!                     && !e.isPopupTrigger()) {
+                  graphControl.setCursor(mxGraphHandler.FOLD_CURSOR);
+                  updateService.submit(new Runnable() {
+                      @Override
+***************
+*** 607,615 ****
+                              int dx = e.getX() - start.x;
+                              int dy = e.getY() - start.y;
+                              double scale = view.getScale();
+!                             view.setTranslate(new mxPoint(viewTranslate.getX()
+!                                     + dx / scale, viewTranslate.getY() + dy
+!                                     / scale));
+                              restartTimer();
+                          }
+                          e.consume();
+--- 607,615 ----
+                              int dx = e.getX() - start.x;
+                              int dy = e.getY() - start.y;
+                              double scale = view.getScale();
+!                             view.setTranslate(new mxPoint(
+!                                     viewTranslate.getX() + dx / scale,
+!                                     viewTranslate.getY() + dy / scale));
+                              restartTimer();
+                          }
+                          e.consume();
+***************
+*** 620,626 ****
+  
+          /*
+           * (non-Javadoc)
+!          * 
+           * @see
+           * com.mxgraph.swing.handler.mxPanningHandler#mouseReleased(java.awt
+           * .event.MouseEvent)
+--- 620,626 ----
+  
+          /*
+           * (non-Javadoc)
+!          *
+           * @see
+           * com.mxgraph.swing.handler.mxPanningHandler#mouseReleased(java.awt
+           * .event.MouseEvent)
+***************
+*** 639,645 ****
+  
+          /**
+           * Description:
+!          * 
+           * @param graphComponent
+           */
+          public GraphHandler(mxGraphComponent graphComponent) {
+--- 639,645 ----
+  
+          /**
+           * Description:
+!          *
+           * @param graphComponent
+           */
+          public GraphHandler(mxGraphComponent graphComponent) {
+***************
+*** 649,655 ****
+  
+          /*
+           * (non-Javadoc)
+!          * 
+           * @see
+           * com.mxgraph.swing.handler.mxGraphHandler#mousePressed(java.awt.event
+           * .MouseEvent)
+--- 649,655 ----
+  
+          /*
+           * (non-Javadoc)
+!          *
+           * @see
+           * com.mxgraph.swing.handler.mxGraphHandler#mousePressed(java.awt.event
+           * .MouseEvent)
+***************
+*** 663,669 ****
+  
+          /*
+           * (non-Javadoc)
+!          * 
+           * @see
+           * com.mxgraph.swing.handler.mxGraphHandler#mouseReleased(java.awt.event
+           * .MouseEvent)
+--- 663,669 ----
+  
+          /*
+           * (non-Javadoc)
+!          *
+           * @see
+           * com.mxgraph.swing.handler.mxGraphHandler#mouseReleased(java.awt.event
+           * .MouseEvent)
+***************
+*** 691,714 ****
+  
+          /*
+           * (non-Javadoc)
+!          * 
+           * @see
+           * com.mxgraph.swing.handler.mxGraphHandler#getCursor(java.awt.event
+           * .MouseEvent)
+           */
+          @Override
+          protected synchronized Cursor getCursor(MouseEvent e) {
+!             mxCell cell =
+!                     (mxCell) graphComponent
+!                             .getCellAt(e.getX(), e.getY(), false);
+  
+              updateHighlight(cellFindingId.get(), cell);
+              if (cell == null) {
+                  return null;
+              }
+  
+!             if (isMoveEnabled()
+!                     && graphComponent.getGraph().isCellMovable(cell)
+                      && isDragTrigger(e)) {
+                  return MOVE_CURSOR;
+              } else {
+--- 691,712 ----
+  
+          /*
+           * (non-Javadoc)
+!          *
+           * @see
+           * com.mxgraph.swing.handler.mxGraphHandler#getCursor(java.awt.event
+           * .MouseEvent)
+           */
+          @Override
+          protected synchronized Cursor getCursor(MouseEvent e) {
+!             mxCell cell = (mxCell) graphComponent.getCellAt(e.getX(), e.getY(),
+!                     false);
+  
+              updateHighlight(cellFindingId.get(), cell);
+              if (cell == null) {
+                  return null;
+              }
+  
+!             if (isMoveEnabled() && graphComponent.getGraph().isCellMovable(cell)
+                      && isDragTrigger(e)) {
+                  return MOVE_CURSOR;
+              } else {
+***************
+*** 790,808 ****
+                      g2d.dispose();
+                  }
+              } finally {
+!                 log.info("Create GraphBuffer-"
+!                         + id
+!                         + " "
+!                         + (img == null ? "" : img.getWidth() + "x"
+!                                 + img.getHeight()) + " on " + graph + " in "
+!                         + (System.currentTimeMillis() - t) + " ms");
+              }
+              return new GraphBuffer(view, img, newTrans, newScale);
+          }
+  
+          /*
+           * (non-Javadoc)
+!          * 
+           * @see
+           * com.mxgraph.swing.mxGraphComponent.mxGraphControl#paint(java.awt.
+           * Graphics)
+--- 788,807 ----
+                      g2d.dispose();
+                  }
+              } finally {
+!                 log.info(
+!                         "Create GraphBuffer-" + id + " "
+!                                 + (img == null ? ""
+!                                         : img.getWidth() + "x"
+!                                                 + img.getHeight())
+!                                 + " on " + graph + " in "
+!                                 + (System.currentTimeMillis() - t) + " ms");
+              }
+              return new GraphBuffer(view, img, newTrans, newScale);
+          }
+  
+          /*
+           * (non-Javadoc)
+!          *
+           * @see
+           * com.mxgraph.swing.mxGraphComponent.mxGraphControl#paint(java.awt.
+           * Graphics)
+***************
+*** 831,837 ****
+  
+          /*
+           * (non-Javadoc)
+!          * 
+           * @see
+           * com.mxgraph.swing.mxGraphComponent.mxGraphControl#updatePreferredSize
+           * ()
+--- 830,836 ----
+  
+          /*
+           * (non-Javadoc)
+!          *
+           * @see
+           * com.mxgraph.swing.mxGraphComponent.mxGraphControl#updatePreferredSize
+           * ()
+***************
+*** 852,858 ****
+  
+              /**
+               * Description:
+!              * 
+               * @param image
+               * @param trans
+               * @param scale
+--- 851,857 ----
+  
+              /**
+               * Description:
+!              *
+               * @param image
+               * @param trans
+               * @param scale
+