You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2014/01/10 16:17:32 UTC

[2/2] git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/3a68b428
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/3a68b428
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/3a68b428

Branch: refs/heads/develop
Commit: 3a68b428656b2e2092e8f274d9bd426b5038c838
Parents: 2253bcc 60ae655
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Fri Jan 10 16:17:15 2014 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Fri Jan 10 16:17:15 2014 +0100

----------------------------------------------------------------------
 LICENSE.txt                                     |   71 -
 .../maven/plugins/refpack/RefPackMojo.java      |   13 +-
 launchers/marmotta-installer/pom.xml            |   18 +
 .../src/main/resources/installer/LICENSE.txt    |   72 -
 .../src/main/resources/installer/standalone.xml |    1 +
 launchers/marmotta-splash/pom.xml               |   32 +-
 .../src/ext/java/net/miginfocom/layout/AC.java  |  564 -----
 .../java/net/miginfocom/layout/BoundSize.java   |  273 --
 .../src/ext/java/net/miginfocom/layout/CC.java  | 1833 --------------
 .../net/miginfocom/layout/ComponentWrapper.java |  297 ---
 .../net/miginfocom/layout/ConstraintParser.java | 1464 -----------
 .../net/miginfocom/layout/ContainerWrapper.java |   69 -
 .../net/miginfocom/layout/DimConstraint.java    |  471 ----
 .../ext/java/net/miginfocom/layout/Grid.java    | 2350 ------------------
 .../ext/java/net/miginfocom/layout/IDEUtil.java |  789 ------
 .../miginfocom/layout/InCellGapProvider.java    |   65 -
 .../src/ext/java/net/miginfocom/layout/LC.java  | 1032 --------
 .../net/miginfocom/layout/LayoutCallback.java   |   77 -
 .../java/net/miginfocom/layout/LayoutUtil.java  |  566 -----
 .../java/net/miginfocom/layout/LinkHandler.java |  200 --
 .../net/miginfocom/layout/PlatformDefaults.java |  772 ------
 .../net/miginfocom/layout/ResizeConstraint.java |   92 -
 .../net/miginfocom/layout/UnitConverter.java    |   59 -
 .../java/net/miginfocom/layout/UnitValue.java   |  637 -----
 .../java/net/miginfocom/swing/MigLayout.java    |  701 ------
 .../miginfocom/swing/SwingComponentWrapper.java |  459 ----
 .../miginfocom/swing/SwingContainerWrapper.java |  109 -
 .../swingbits/action/ActionBuilderHelper.java   |  241 --
 .../action/ActionContainerBuilderFactory.java   |   89 -
 .../swingbits/action/ActionDropDownMenu.java    |   91 -
 .../org/oxbow/swingbits/action/ActionGroup.java |  131 -
 .../org/oxbow/swingbits/action/Actions.java     |   83 -
 .../org/oxbow/swingbits/action/CheckAction.java |   39 -
 .../action/IActionContainerBuilder.java         |   43 -
 .../org/oxbow/swingbits/action/RadioAction.java |   39 -
 .../org/oxbow/swingbits/action/dropdown.png     |  Bin 1227 -> 0 bytes
 .../swingbits/dialog/task/CommandLink.java      |  104 -
 .../dialog/task/ContentDesignFactory.java       |   55 -
 .../dialog/task/ICommandLinkPainter.java        |   43 -
 .../swingbits/dialog/task/IContentDesign.java   |  127 -
 .../oxbow/swingbits/dialog/task/TaskDialog.java |  968 --------
 .../dialog/task/TaskDialogException.java        |   53 -
 .../swingbits/dialog/task/TaskDialogs.java      |  666 -----
 .../dialog/task/design/CommandLinkButton.java   |  147 --
 .../task/design/CommandLinkButtonGroup.java     |   53 -
 .../task/design/DefaultCommandLinkPainter.java  |  162 --
 .../task/design/DefaultContentDesign.java       |  192 --
 .../dialog/task/design/DetailsToggleButton.java |   49 -
 .../dialog/task/design/LinuxContentDesign.java  |   75 -
 .../task/design/MacOsCommandLinkPainter.java    |   48 -
 .../dialog/task/design/MacOsContentDesign.java  |  137 -
 .../dialog/task/design/TaskDialogContent.java   |  385 ---
 .../task/design/WindowsCommandLinkPainter.java  |   65 -
 .../task/design/WindowsContentDesign.java       |   66 -
 .../swingbits/list/ActionCheckListModel.java    |  188 --
 .../org/oxbow/swingbits/list/CheckList.java     |  173 --
 .../oxbow/swingbits/list/CheckListEditor.java   |   84 -
 .../swingbits/list/CheckListFilterType.java     |   31 -
 .../oxbow/swingbits/list/CheckListRenderer.java |  228 --
 .../swingbits/list/DefaultCheckListModel.java   |  175 --
 .../oxbow/swingbits/list/ICheckListAction.java  |   33 -
 .../oxbow/swingbits/list/ICheckListModel.java   |   77 -
 .../oxbow/swingbits/misc/JSearchTextField.java  |   72 -
 .../java/org/oxbow/swingbits/misc/search.png    |  Bin 851 -> 0 bytes
 .../org/oxbow/swingbits/popup/PopupWindow.java  |  331 ---
 .../swingbits/table/TableHeaderRenderer.java    |   77 -
 .../table/filter/AbstractTableFilter.java       |  191 --
 .../table/filter/DistinctColumnItem.java        |  115 -
 .../table/filter/FilterTableHeaderRenderer.java |  103 -
 .../table/filter/IFilterChangeListener.java     |   37 -
 .../swingbits/table/filter/ITableFilter.java    |   99 -
 .../swingbits/table/filter/JTableFilter.java    |  116 -
 .../filter/TableAwareCheckListRenderer.java     |   86 -
 .../table/filter/TableFilterColumnPopup.java    |  317 ---
 .../table/filter/TableFilterState.java          |  129 -
 .../table/filter/TableRowFilterSupport.java     |  166 --
 .../org/oxbow/swingbits/table/filter/funnel.png |  Bin 797 -> 0 bytes
 .../swingbits/table/filter/funnel_delete.png    |  Bin 906 -> 0 bytes
 .../oxbow/swingbits/util/CollectionUtils.java   |   64 -
 .../java/org/oxbow/swingbits/util/DeepCopy.java |   94 -
 .../oxbow/swingbits/util/DeepCopyException.java |   57 -
 .../util/DefaultObjectToStringTranslator.java   |   42 -
 .../util/IObjectToStringTranslator.java         |   38 -
 .../org/oxbow/swingbits/util/IValueWrapper.java |    7 -
 .../java/org/oxbow/swingbits/util/Markup.java   |  123 -
 .../oxbow/swingbits/util/OperatingSystem.java   |   97 -
 .../org/oxbow/swingbits/util/Preconditions.java |   58 -
 .../org/oxbow/swingbits/util/Screenshot.java    |  143 --
 .../java/org/oxbow/swingbits/util/Strings.java  |  102 -
 .../util/copy/FastByteArrayInputStream.java     |   92 -
 .../util/copy/FastByteArrayOutputStream.java    |  117 -
 .../swingbits/util/swing/AncestorAdapter.java   |   51 -
 .../swingbits/util/swing/BeanProperty.java      |   93 -
 .../swingbits/util/swing/CompoundIcon.java      |  302 ---
 .../oxbow/swingbits/util/swing/EmptyIcon.java   |  104 -
 .../org/oxbow/swingbits/util/swing/Icons.java   |   98 -
 .../oxbow/swingbits/util/swing/SwingBean.java   |   76 -
 .../src/ext/resources/META-INF/LICENSE          |  208 --
 .../src/ext/resources/META-INF/NOTICE           |   11 -
 .../swingbits/dialog/task/arrowGreenRight.png   |  Bin 3526 -> 0 bytes
 .../swingbits/dialog/task/fewerDetails.png      |  Bin 933 -> 0 bytes
 .../swingbits/dialog/task/fewerDetailsMac.png   |  Bin 458 -> 0 bytes
 .../oxbow/swingbits/dialog/task/linux_error.png |  Bin 1998 -> 0 bytes
 .../oxbow/swingbits/dialog/task/linux_info.png  |  Bin 2328 -> 0 bytes
 .../swingbits/dialog/task/linux_question.png    |  Bin 2671 -> 0 bytes
 .../swingbits/dialog/task/linux_warning.png     |  Bin 2169 -> 0 bytes
 .../oxbow/swingbits/dialog/task/moreDetails.png |  Bin 912 -> 0 bytes
 .../swingbits/dialog/task/moreDetailsMac.png    |  Bin 468 -> 0 bytes
 .../marmotta/splash/ProgressListener.java       |    2 +-
 .../marmotta/splash/SplashContextListener.java  |    2 +-
 .../marmotta/splash/SplashScreenListener.java   |    2 +-
 .../splash/SplashScreenUpdaterBase.java         |    2 +-
 .../marmotta/splash/common/MarmottaContext.java |    2 +-
 .../splash/common/MarmottaStartupHelper.java    |    2 +-
 .../splash/common/ui/MessageDialog.java         |  142 ++
 .../splash/common/ui/SelectionDialog.java       |  215 ++
 .../splash/startup/StartupListener.java         |   27 +-
 .../splash/systray/SystrayListener.java         |   20 +-
 .../src/main/resources/META-INF/LICENSE         |  284 ---
 .../src/main/resources/META-INF/NOTICE          |   11 -
 .../src/main/resources/task-dialog.properties   |   34 -
 .../main/resources/task-dialog_de_DE.properties |   16 -
 .../main/resources/task-dialog_es_ES.properties |   16 -
 .../main/resources/task-dialog_fr_FR.properties |   16 -
 .../main/resources/task-dialog_it_IT.properties |   16 -
 .../main/resources/task-dialog_pl_PL.properties |   16 -
 .../main/resources/task-dialog_pt_BR.properties |   16 -
 .../main/resources/task-dialog_pt_PT.properties |   16 -
 .../main/resources/task-dialog_zh_CN.properties |   16 -
 .../splash/startup/StartupListenerTest.java     |   26 +
 .../src/main/webapp/META-INF/LICENSE            |   72 -
 .../src/main/webapp/META-INF/LICENSE            |   72 -
 132 files changed, 451 insertions(+), 22634 deletions(-)
----------------------------------------------------------------------