pool/opa-fmgui
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/science:HPC/opa-fmgui?expand=0&rev=4

Browse Source
This commit is contained in:
Josef Möllers 2017-04-06 11:40:58 +00:00 committed by Git OBS Bridge
parent d335cac299
commit 01586995ce
17 changed files with 849 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
jgraphx-3.6.0.0.jar (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
jsch-0.1.53.jar (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
mbassador-1.2.4.2.jar (Stored with Git LFS) Normal file
View File

Binary file not shown.

1
opa-fmgui.changes
View File

@ -6,6 +6,7 @@ Wed Apr 5 08:46:46 UTC 2017 - josef.moellers@suse.com
2:opa-fmgui-desktopfile-without-binary.patch 2:opa-fmgui-desktopfile-without-binary.patch
and and
4:opa-fmgui-fix-detection-of-OpenJDK.patch 4:opa-fmgui-fix-detection-of-OpenJDK.patch
Some changes to SPEC file were necessary.
[FATE#321477] [FATE#321477]
------------------------------------------------------------------- -------------------------------------------------------------------

51
opa-fmgui.spec
View File

@ -20,14 +20,14 @@
%define name opa-fmgui %define name opa-fmgui
%define appdir . %define appdir .
%define appfolder opa-fmgui %define appfolder opa-fmgui
%define appjar fmgui.jar %define appjar opa-fmgui.jar
%define _binary_payload w9.gzdio %define _binary_payload w9.gzdio
Name: opa-fmgui Name: opa-fmgui
Version: 10.1.0.0 Version: 10.1.0.0
Release: 0 Release: 0
Summary: Fabric Manager Graphical User Interface Summary: Fabric Manager Graphical User Interface
License: BSD-3-Clause License: BSD-3-Clause and LGPL-2.0+
Group: Applications/System Group: Applications/System
Url: http://www.intel.com/ Url: http://www.intel.com/
Source0: opa-fmgui.tar.gz Source0: opa-fmgui.tar.gz
@ -48,21 +48,31 @@ Source14: jboss-logging-annotations-1.2.0.Beta1.jar
Source15: jboss-transaction-api_1.2_spec-1.0.0.Final.jar Source15: jboss-transaction-api_1.2_spec-1.0.0.Final.jar
Source16: jcommon-1.0.21.jar Source16: jcommon-1.0.21.jar
Source17: jfreechart-1.0.17.jar Source17: jfreechart-1.0.17.jar
Source18: jgraphx-3.3.1.1.jar Source18: jgraphx-3.6.0.0.jar
Source19: jsch-0.1.51.jar Source19: jsch-0.1.53.jar
Source20: log4j-1.2.14.jar Source20: log4j-1.2.14.jar
Source21: log4j-over-slf4j-1.7.7.jar Source21: log4j-over-slf4j-1.7.7.jar
Source22: logback-classic-1.1.2.jar Source22: logback-classic-1.1.2.jar
Source23: logback-core-1.1.2.jar Source23: logback-core-1.1.2.jar
Source24: mbassador-1.1.9.jar Source24: mbassador-1.2.4.2.jar
Source25: slf4j-api-1.7.7.jar Source25: slf4j-api-1.7.7.jar
Source26: swingx-all-1.6.4.jar Source26: swingx-all-1.6.5.jar
Source27: swingx-action-1.6.5.jar
Source28: swingx-autocomplete-1.6.5.jar
Source29: swingx-beaninfo-1.6.5.jar
Source30: swingx-common-1.6.5.jar
Source31: swingx-core-1.6.5.jar
Source32: swingx-graphics-1.6.5.jar
Source33: swingx-mavensupport-1.6.5.jar
Source34: swingx-painters-1.6.5.jar
Source35: swingx-plaf-1.6.5.jar
Source36: swingx-testsupport-1.6.5.jar
Patch1: gradle-use_local_repo.patch Patch1: gradle-use_local_repo.patch
Patch3: opa-fmgui-intel-manifest-license.patch Patch3: opa-fmgui-intel-manifest-license.patch
Patch5: stl-14927-jgraphx-update.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: gradle-open-api
BuildRequires: jre >= 1.7 BuildRequires: jre >= 1.7
Requires: jre >= 1.7 Requires: jre >= 1.7
Requires: mlocate Requires: mlocate
@ -70,6 +80,7 @@ BuildRequires: libgnome
BuildRequires: openssl BuildRequires: openssl
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: wget BuildRequires: wget
BuildRequires: gradle
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
@ -81,6 +92,7 @@ script fmgui.
%setup -q -n opa-fmgui %setup -q -n opa-fmgui
%patch1 -p1 %patch1 -p1
%patch3 -p1 %patch3 -p1
%patch5 -p1
%build %build
GRADLE_LIB_DIR=$RPM_SOURCE_DIR GRADLE_LIB_DIR=$RPM_SOURCE_DIR
@ -96,28 +108,27 @@ mkdir -p %{buildroot}%{_sysconfdir}/xdg/menus/applications-merged
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_sysconfdir}/profile.d
mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/ mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/
mkdir -p %{buildroot}/%{_datadir}/doc/%{name}/licenses # mkdir -p %%{buildroot}/%%{_datadir}/doc/%%{name}/licenses
mkdir -p %{buildroot}/%{_datadir}/icons/hicolor mkdir -p %{buildroot}/%{_datadir}/icons/hicolor
mkdir -p %{buildroot}/%{_datadir}/applications mkdir -p %{buildroot}/%{_datadir}/applications
mkdir -p %{buildroot}%{_datadir}/desktop-directories mkdir -p %{buildroot}%{_datadir}/desktop-directories
install -m 755 %{appdir}/%{appjar} %{buildroot}%{_javadir}/%{appfolder} install -m 755 %{appdir}/%{appjar} %{buildroot}%{_javadir}/%{appfolder}
cp %{appdir}/LICENSE %{buildroot}/%{_datadir}/doc/%{name}/ # cp %%{appdir}/LICENSE %%{buildroot}/%%{_datadir}/doc/%%{name}/
cp %{appdir}/THIRD-PARTY-README %{buildroot}/%{_datadir}/doc/%{name}/ # cp %%{appdir}/THIRD-PARTY-README %%{buildroot}/%%{_datadir}/doc/%%{name}/
cp %{appdir}/Pre-Release_Notice_v.2.pdf %{buildroot}/%{_datadir}/doc/%{name}/ # cp %%{appdir}/Third_Party_Copyright_Notices_and_Licenses %%{buildroot}/%%{_datadir}/doc/%%{name}/
cp %{appdir}/Third_Party_Copyright_Notices_and_Licenses.docx %{buildroot}/%{_datadir}/doc/%{name}/ # cp -r %%{appdir}/licenses %%{buildroot}/%%{_datadir}/doc/%%{name}/
cp -r %{appdir}/licenses %{buildroot}/%{_datadir}/doc/%{name}/
install -m 644 -pDt %{buildroot}/%{_javadir}/%{appfolder}/lib %{appdir}/lib/* install -m 644 -pDt %{buildroot}/%{_javadir}/%{appfolder}/lib %{appdir}/lib/*
cp -a %{appdir}/target/help/* %{buildroot}%{_javadir}/%{appfolder}/help cp -a %{appdir}/target/help/* %{buildroot}%{_javadir}/%{appfolder}/help
cp %{appdir}/help/*.html %{buildroot}%{_javadir}/%{appfolder}/help cp %{appdir}/help/*.html %{buildroot}%{_javadir}/%{appfolder}/help
#cp %{appdir}/help/LICENSE %{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/fmguiclear.sh %{buildroot}%{_javadir}/%{appfolder}/util
install -m 755 %{appdir}/util/postsetup.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 cp -a %{appdir}/util/ClearFMGUICache.desktop %{buildroot}%{_javadir}/%{appfolder}/util
install -m 755 %{appdir}/install/fmgui.sh %{buildroot}%{_bindir}/opa-fmgui install -m 755 %{appdir}/install/opa-fmgui.sh %{buildroot}%{_bindir}/opa-fmgui
#for fmgui.desktop #for fmgui.desktop
cp -a %{appdir}/install/fmguivars.sh %{buildroot}/%{_sysconfdir}/profile.d cp -a %{appdir}/install/fmguivars.sh %{buildroot}/%{_sysconfdir}/profile.d
@ -140,6 +151,8 @@ rm %{buildroot}/fmgui.desktop
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README THIRD-PARTY-README Third_Party_Copyright_Notices_and_Licenses
%license LICENSE gritty/gritty_license.txt
%dir %{_sysconfdir}/xdg/menus %dir %{_sysconfdir}/xdg/menus
%dir %{_datadir}/desktop-directories %dir %{_datadir}/desktop-directories
%dir %{_datadir}/doc/opa-fmgui %dir %{_datadir}/doc/opa-fmgui
@ -148,12 +161,12 @@ rm %{buildroot}/fmgui.desktop
%{_javadir}/%{appfolder} %{_javadir}/%{appfolder}
%{_bindir}/opa-fmgui %{_bindir}/opa-fmgui
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%{_datadir}/doc/%{name}/* # %%{_datadir}/doc/%%{name}/*
%{_datadir}/desktop-directories/Fabric.directory %{_datadir}/desktop-directories/Fabric.directory
%{_datadir}/icons/hicolor %{_datadir}/icons/hicolor
%license %{_datadir}/doc/opa-fmgui/LICENSE # %%license %%{_datadir}/doc/opa-fmgui/LICENSE
%license %{_datadir}/doc/opa-fmgui/licenses/* # %%license %%{_datadir}/doc/opa-fmgui/licenses/*
%config %{_sysconfdir}/xdg/menus/applications-merged/Fabric.menu %config %{_sysconfdir}/xdg/menus/applications-merged/Fabric.menu
%config %{_sysconfdir}/profile.d/fmguivars.sh %config %{_sysconfdir}/profile.d/fmguivars.sh

774
stl-14927-jgraphx-update.patch Normal file
View File

@ -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

BIN
swingx-action-1.6.5.jar (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
swingx-all-1.6.5.jar (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
swingx-autocomplete-1.6.5.jar (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
swingx-beaninfo-1.6.5.jar (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
swingx-common-1.6.5.jar (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
swingx-core-1.6.5.jar (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
swingx-graphics-1.6.5.jar (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
swingx-mavensupport-1.6.5.jar (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
swingx-painters-1.6.5.jar (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
swingx-plaf-1.6.5.jar (Stored with Git LFS) Normal file
View File

Binary file not shown.

3
swingx-testsupport-1.6.5.jar Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b27447a35b4ef2aac002e7cb63020f7dc54c253f39bf1893a9e6aa4b825e9e70
size 14366