From cc57fae5cf2dac73d22ca31b717aaf5bdaf95cd0 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Thu, 4 Oct 2012 20:48:01 -0300 Subject: [PATCH] Update copyright year. --- core-js/src/main/javascript/Utils.js | 2 +- core-js/src/main/javascript/header.js | 2 +- license.txt | 2 +- .../src/main/javascript/ActionDispatcher.js | 2 +- mindplot/src/main/javascript/ActionIcon.js | 2 +- mindplot/src/main/javascript/CentralTopic.js | 2 +- .../main/javascript/CollabActionDispatcher.js | 2 +- mindplot/src/main/javascript/Command.js | 2 +- .../src/main/javascript/ConnectionLine.js | 2 +- mindplot/src/main/javascript/ControlPoint.js | 2 +- mindplot/src/main/javascript/Designer.js | 2 +- .../main/javascript/DesignerActionRunner.js | 2 +- .../src/main/javascript/DesignerKeyboard.js | 2 +- mindplot/src/main/javascript/DesignerModel.js | 2 +- .../main/javascript/DesignerUndoManager.js | 2 +- mindplot/src/main/javascript/DragConnector.js | 2 +- mindplot/src/main/javascript/DragManager.js | 2 +- mindplot/src/main/javascript/DragPivot.js | 2 +- mindplot/src/main/javascript/DragTopic.js | 2 +- mindplot/src/main/javascript/EditorOptions.js | 18 +++++++ .../src/main/javascript/EditorProperties.js | 2 +- mindplot/src/main/javascript/Icon.js | 2 +- mindplot/src/main/javascript/IconGroup.js | 2 +- mindplot/src/main/javascript/ImageIcon.js | 2 +- mindplot/src/main/javascript/LinkIcon.js | 2 +- .../main/javascript/LocalStorageManager.js | 2 +- mindplot/src/main/javascript/MainTopic.js | 2 +- mindplot/src/main/javascript/Messages.js | 2 +- .../main/javascript/MultilineTextEditor.js | 2 +- mindplot/src/main/javascript/NodeGraph.js | 2 +- mindplot/src/main/javascript/NoteIcon.js | 2 +- .../src/main/javascript/PersistenceManager.js | 2 +- mindplot/src/main/javascript/Relationship.js | 2 +- .../src/main/javascript/RelationshipPivot.js | 2 +- .../main/javascript/RestPersistenceManager.js | 2 +- mindplot/src/main/javascript/ScreenManager.js | 2 +- .../src/main/javascript/ShrinkConnector.js | 2 +- .../javascript/StandaloneActionDispatcher.js | 2 +- mindplot/src/main/javascript/TextEditor.js | 2 +- .../src/main/javascript/TextEditorFactory.js | 2 +- mindplot/src/main/javascript/Topic.js | 2 +- .../main/javascript/TopicEventDispatcher.js | 2 +- mindplot/src/main/javascript/TopicFeature.js | 2 +- mindplot/src/main/javascript/Workspace.js | 2 +- .../collaboration/CollaborationManager.js | 2 +- .../AbstractCollaborativeModelFactory.js | 2 +- .../collab/BrixCollaborativeModelFactory.js | 2 +- .../framework/collab/BrixFramework.js | 2 +- .../framework/collab/model/Mindmap.js | 2 +- .../framework/collab/model/NodeModel.js | 2 +- .../commands/AddFeatureToTopicCommand.js | 2 +- .../commands/AddRelationshipCommand.js | 2 +- .../javascript/commands/AddTopicCommand.js | 2 +- .../commands/ChangeFeatureToTopicCommand.js | 2 +- .../main/javascript/commands/DeleteCommand.js | 2 +- .../javascript/commands/DragTopicCommand.js | 2 +- .../commands/GenericFunctionCommand.js | 2 +- .../commands/MoveControlPointCommand.js | 2 +- .../commands/RemoveFeatureFromTopicCommand.js | 2 +- mindplot/src/main/javascript/header.js | 2 +- .../javascript/layout/AbstractBasicSorter.js | 2 +- .../main/javascript/layout/BalancedSorter.js | 2 +- .../src/main/javascript/layout/ChangeEvent.js | 2 +- .../layout/ChildrenSorterStrategy.js | 2 +- .../src/main/javascript/layout/EventBus.js | 2 +- .../javascript/layout/EventBusDispatcher.js | 2 +- .../src/main/javascript/layout/GridSorter.js | 2 +- .../main/javascript/layout/LayoutManager.js | 2 +- mindplot/src/main/javascript/layout/Node.js | 2 +- .../main/javascript/layout/OriginalLayout.js | 2 +- .../main/javascript/layout/RootedTreeSet.js | 2 +- .../main/javascript/layout/SymmetricSorter.js | 2 +- .../src/main/javascript/model/FeatureModel.js | 2 +- .../src/main/javascript/model/IMindmap.js | 2 +- .../src/main/javascript/model/INodeModel.js | 2 +- .../src/main/javascript/model/IconModel.js | 2 +- .../src/main/javascript/model/LinkModel.js | 2 +- mindplot/src/main/javascript/model/Mindmap.js | 2 +- .../src/main/javascript/model/NodeModel.js | 2 +- .../src/main/javascript/model/NoteModel.js | 2 +- .../javascript/model/RelationshipModel.js | 2 +- .../persistence/Beta2PelaMigrator.js | 2 +- .../javascript/persistence/ModelCodeName.js | 2 +- .../persistence/Pela2TangoMigrator.js | 2 +- .../persistence/XMLSerializerFactory.js | 2 +- .../persistence/XMLSerializer_Beta.js | 2 +- .../persistence/XMLSerializer_Pela.js | 2 +- .../persistence/XMLSerializer_Tango.js | 2 +- .../src/main/javascript/util/FadeEffect.js | 2 +- mindplot/src/main/javascript/util/Shape.js | 2 +- .../javascript/widget/ColorPalettePanel.js | 2 +- .../src/main/javascript/widget/FloatingTip.js | 2 +- .../main/javascript/widget/FontFamilyPanel.js | 2 +- .../main/javascript/widget/FontSizePanel.js | 2 +- mindplot/src/main/javascript/widget/IMenu.js | 2 +- .../src/main/javascript/widget/IconPanel.js | 2 +- .../widget/KeyboardShortcutTooltip.js | 2 +- .../src/main/javascript/widget/LinkEditor.js | 2 +- .../main/javascript/widget/LinkIconTooltip.js | 2 +- .../javascript/widget/ListToolbarPanel.js | 2 +- mindplot/src/main/javascript/widget/Menu.js | 2 +- ...rrorNotifier.js => ModalDialogNotifier.js} | 2 +- .../src/main/javascript/widget/NoteEditor.js | 2 +- .../src/main/javascript/widget/ToolbarItem.js | 2 +- .../main/javascript/widget/ToolbarNotifier.js | 2 +- .../main/javascript/widget/ToolbarPaneItem.js | 2 +- .../main/javascript/widget/TopicShapePanel.js | 2 +- .../static/test/BalancedTestSuite.js | 2 +- .../javascript/static/test/FreeTestSuite.js | 2 +- .../static/test/SymmetricTestSuite.js | 2 +- .../test/javascript/static/test/TestSuite.js | 2 +- web2d/src/main/javascript/Arrow.js | 2 +- web2d/src/main/javascript/CurvedLine.js | 2 +- web2d/src/main/javascript/Element.js | 2 +- web2d/src/main/javascript/Elipse.js | 2 +- web2d/src/main/javascript/Font.js | 2 +- web2d/src/main/javascript/Group.js | 2 +- web2d/src/main/javascript/Image.js | 2 +- web2d/src/main/javascript/Line.js | 2 +- web2d/src/main/javascript/Point.js | 2 +- web2d/src/main/javascript/PolyLine.js | 2 +- web2d/src/main/javascript/Rect.js | 2 +- web2d/src/main/javascript/Text.js | 2 +- web2d/src/main/javascript/Toolkit.js | 2 +- web2d/src/main/javascript/Workspace.js | 2 +- web2d/src/main/javascript/header.js | 2 +- .../src/main/javascript/peer/svg/ArialFont.js | 2 +- .../src/main/javascript/peer/svg/ArrowPeer.js | 2 +- .../javascript/peer/svg/CurvedLinePeer.js | 2 +- .../main/javascript/peer/svg/ElementPeer.js | 2 +- .../main/javascript/peer/svg/ElipsePeer.js | 2 +- web2d/src/main/javascript/peer/svg/Font.js | 2 +- .../src/main/javascript/peer/svg/GroupPeer.js | 2 +- .../src/main/javascript/peer/svg/ImagePeer.js | 2 +- .../src/main/javascript/peer/svg/LinePeer.js | 2 +- .../main/javascript/peer/svg/PolyLinePeer.js | 2 +- .../src/main/javascript/peer/svg/RectPeer.js | 2 +- .../main/javascript/peer/svg/TahomaFont.js | 2 +- .../src/main/javascript/peer/svg/TextPeer.js | 2 +- .../src/main/javascript/peer/svg/TimesFont.js | 2 +- .../main/javascript/peer/svg/VerdanaFont.js | 2 +- .../main/javascript/peer/svg/WorkspacePeer.js | 2 +- .../main/javascript/peer/utils/EventUtils.js | 2 +- .../javascript/peer/utils/TransformUtils.js | 2 +- web2d/src/test/javascript/render/utils.js | 2 +- wise-editor/src/main/webapp/js/editor.js | 2 +- .../com/wisemapping/dao/MindmapManager.java | 2 +- .../wisemapping/dao/MindmapManagerImpl.java | 2 +- .../java/com/wisemapping/dao/UserManager.java | 2 +- .../com/wisemapping/dao/UserManagerImpl.java | 2 +- .../AccessDeniedSecurityException.java | 4 +- .../exceptions/ClientException.java | 9 +++- .../EditionSessionExpiredException.java | 4 +- .../exceptions/EmailNotExistsException.java | 2 +- .../GoogleChromeFrameRequiredException.java | 2 +- .../exceptions/ImportUnexpectedException.java | 2 +- .../wisemapping/exceptions/LockException.java | 4 +- .../MultipleSessionsOpenException.java | 4 +- .../exceptions/SessionExpiredException.java | 14 ++--- .../com/wisemapping/exceptions/Severity.java | 25 +++++++++ .../UnsupportedBrowserException.java | 2 +- .../exceptions/WiseMappingException.java | 2 +- .../wisemapping/exporter/ExportException.java | 2 +- .../wisemapping/exporter/ExportFormat.java | 2 +- .../exporter/ExportProperties.java | 2 +- .../com/wisemapping/exporter/Exporter.java | 2 +- .../wisemapping/exporter/ExporterFactory.java | 2 +- .../exporter/FreemindExporter.java | 2 +- .../filter/BrowserSupportInterceptor.java | 2 +- .../filter/RequestPropertiesInterceptor.java | 2 +- .../filter/SupportedUserAgent.java | 2 +- .../filter/UserLocaleInterceptor.java | 2 +- .../wisemapping/importer/ImportFormat.java | 2 +- .../com/wisemapping/importer/Importer.java | 2 +- .../importer/ImporterException.java | 2 +- .../wisemapping/importer/ImporterFactory.java | 2 +- .../importer/JaxbCDATAMarshaller.java | 18 +++++++ .../wisemapping/importer/VersionNumber.java | 18 +++++++ .../freemind/FreemindIconConverter.java | 2 +- .../importer/freemind/FreemindImporter.java | 2 +- .../java/com/wisemapping/mail/Mailer.java | 2 +- .../wisemapping/mail/NotificationService.java | 2 +- .../com/wisemapping/model/AccessAuditory.java | 2 +- .../com/wisemapping/model/Collaboration.java | 2 +- .../wisemapping/model/CollaborationEmail.java | 2 +- .../model/CollaborationProperties.java | 2 +- .../wisemapping/model/CollaborationRole.java | 2 +- .../com/wisemapping/model/Collaborator.java | 2 +- .../java/com/wisemapping/model/Constants.java | 2 +- .../main/java/com/wisemapping/model/Font.java | 2 +- .../com/wisemapping/model/IconFamily.java | 2 +- .../wisemapping/model/MindMapCriteria.java | 2 +- .../com/wisemapping/model/MindMapHistory.java | 2 +- .../java/com/wisemapping/model/Mindmap.java | 2 +- .../com/wisemapping/model/MindmapIcon.java | 2 +- .../com/wisemapping/model/MindmapIcons.java | 2 +- .../com/wisemapping/model/ShapeStyle.java | 2 +- .../main/java/com/wisemapping/model/User.java | 2 +- .../ncontroller/ExtensionsController.java | 2 +- .../ncontroller/LoginController.java | 2 +- .../ncontroller/MindmapController.java | 2 +- .../ncontroller/PublicPagesController.java | 2 +- .../ncontroller/UsersController.java | 2 +- .../wisemapping/rest/AccountController.java | 2 +- .../com/wisemapping/rest/AdminController.java | 2 +- .../com/wisemapping/rest/BaseController.java | 9 ++-- ...bugMappingJacksonHttpMessageConverter.java | 18 +++++++ .../JsonHttpMessageNotReadableException.java | 18 +++++++ .../wisemapping/rest/MindmapController.java | 52 ++++++++++--------- .../com/wisemapping/rest/MindmapFilter.java | 2 +- .../rest/TransformerController.java | 2 +- .../wisemapping/rest/ValidationException.java | 2 +- .../rest/model/RestCollaboration.java | 18 +++++++ .../rest/model/RestCollaborationList.java | 18 +++++++ .../rest/model/RestCollaborator.java | 18 +++++++ .../wisemapping/rest/model/RestErrors.java | 31 ++++++++++- .../wisemapping/rest/model/RestLockInfo.java | 18 +++++++ .../wisemapping/rest/model/RestLogItem.java | 18 +++++++ .../wisemapping/rest/model/RestMindmap.java | 18 +++++++ .../rest/model/RestMindmapHistory.java | 18 +++++++ .../rest/model/RestMindmapHistoryList.java | 18 +++++++ .../rest/model/RestMindmapInfo.java | 18 +++++++ .../rest/model/RestMindmapList.java | 18 +++++++ .../com/wisemapping/rest/model/RestUser.java | 18 +++++++ .../rest/view/ImportTransformationView.java | 2 +- .../wisemapping/rest/view/TransformView.java | 2 +- .../security/AuthenticationProvider.java | 2 +- .../security/CustomPasswordEncoder.java | 2 +- .../com/wisemapping/security/UserDetails.java | 2 +- .../security/UserDetailsService.java | 2 +- .../java/com/wisemapping/security/Utils.java | 2 +- .../security/aop/BaseSecurityAdvice.java | 2 +- .../security/aop/UpdateSecurityAdvise.java | 2 +- .../security/aop/ViewBaseSecurityAdvise.java | 2 +- .../service/CollaborationException.java | 2 +- .../service/HibernateAppListener.java | 2 +- .../wisemapping/service/HibernateUtil.java | 2 +- .../InvalidActivationCodeException.java | 2 +- .../service/InvalidUserEmailException.java | 2 +- .../com/wisemapping/service/LockInfo.java | 2 +- .../com/wisemapping/service/LockManager.java | 2 +- .../wisemapping/service/LockManagerImpl.java | 2 +- .../wisemapping/service/MindmapService.java | 2 +- .../service/MindmapServiceImpl.java | 2 +- .../com/wisemapping/service/UserService.java | 2 +- .../wisemapping/service/UserServiceImpl.java | 2 +- .../java/com/wisemapping/util/JAXBUtils.java | 2 +- .../java/com/wisemapping/util/ZipUtils.java | 2 +- .../validator/MapInfoValidator.java | 2 +- .../com/wisemapping/validator/Messages.java | 2 +- .../wisemapping/validator/UserValidator.java | 2 +- .../java/com/wisemapping/validator/Utils.java | 2 +- .../wisemapping/validator/ValidatorUtils.java | 2 +- .../wisemapping/view/ChangePasswordBean.java | 2 +- .../wisemapping/view/CollaboratorBean.java | 2 +- .../com/wisemapping/view/MindMapBean.java | 2 +- .../com/wisemapping/view/MindMapInfoBean.java | 2 +- .../java/com/wisemapping/view/UserBean.java | 2 +- .../src/main/resources/messages_en.properties | 2 +- .../test/rest/RestAdminITCase.java | 18 +++++++ 260 files changed, 650 insertions(+), 278 deletions(-) rename mindplot/src/main/javascript/widget/{ErrorNotifier.js => ModalDialogNotifier.js} (96%) create mode 100644 wise-webapp/src/main/java/com/wisemapping/exceptions/Severity.java diff --git a/core-js/src/main/javascript/Utils.js b/core-js/src/main/javascript/Utils.js index 9db008e4..97e43e75 100644 --- a/core-js/src/main/javascript/Utils.js +++ b/core-js/src/main/javascript/Utils.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/core-js/src/main/javascript/header.js b/core-js/src/main/javascript/header.js index 359eb697..fdc85e2f 100644 --- a/core-js/src/main/javascript/header.js +++ b/core-js/src/main/javascript/header.js @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/license.txt b/license.txt index 7d244672..3f5065af 100644 --- a/license.txt +++ b/license.txt @@ -1,4 +1,4 @@ - Copyright [2011] [wisemapping] + Copyright [2012] [wisemapping] Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/ActionDispatcher.js b/mindplot/src/main/javascript/ActionDispatcher.js index 74aeb29c..beb9c8ec 100644 --- a/mindplot/src/main/javascript/ActionDispatcher.js +++ b/mindplot/src/main/javascript/ActionDispatcher.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/ActionIcon.js b/mindplot/src/main/javascript/ActionIcon.js index 4e08f7bb..a6abfe1a 100644 --- a/mindplot/src/main/javascript/ActionIcon.js +++ b/mindplot/src/main/javascript/ActionIcon.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/CentralTopic.js b/mindplot/src/main/javascript/CentralTopic.js index 4ac5040d..93fa74d0 100644 --- a/mindplot/src/main/javascript/CentralTopic.js +++ b/mindplot/src/main/javascript/CentralTopic.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/CollabActionDispatcher.js b/mindplot/src/main/javascript/CollabActionDispatcher.js index e68e5cc9..e194e0d1 100644 --- a/mindplot/src/main/javascript/CollabActionDispatcher.js +++ b/mindplot/src/main/javascript/CollabActionDispatcher.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/Command.js b/mindplot/src/main/javascript/Command.js index 21bcc4ae..3b776947 100644 --- a/mindplot/src/main/javascript/Command.js +++ b/mindplot/src/main/javascript/Command.js @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/ConnectionLine.js b/mindplot/src/main/javascript/ConnectionLine.js index 79041834..80d6c2a2 100644 --- a/mindplot/src/main/javascript/ConnectionLine.js +++ b/mindplot/src/main/javascript/ConnectionLine.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/ControlPoint.js b/mindplot/src/main/javascript/ControlPoint.js index d19293da..47e50869 100644 --- a/mindplot/src/main/javascript/ControlPoint.js +++ b/mindplot/src/main/javascript/ControlPoint.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/Designer.js b/mindplot/src/main/javascript/Designer.js index f2be351f..1d0f79e4 100644 --- a/mindplot/src/main/javascript/Designer.js +++ b/mindplot/src/main/javascript/Designer.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/DesignerActionRunner.js b/mindplot/src/main/javascript/DesignerActionRunner.js index 5e96e9b1..c372dac8 100644 --- a/mindplot/src/main/javascript/DesignerActionRunner.js +++ b/mindplot/src/main/javascript/DesignerActionRunner.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/DesignerKeyboard.js b/mindplot/src/main/javascript/DesignerKeyboard.js index f3aebdd5..c6f00fe0 100644 --- a/mindplot/src/main/javascript/DesignerKeyboard.js +++ b/mindplot/src/main/javascript/DesignerKeyboard.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/DesignerModel.js b/mindplot/src/main/javascript/DesignerModel.js index e42b47ea..66d0bad9 100644 --- a/mindplot/src/main/javascript/DesignerModel.js +++ b/mindplot/src/main/javascript/DesignerModel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/DesignerUndoManager.js b/mindplot/src/main/javascript/DesignerUndoManager.js index 30d4f10e..e6612a00 100644 --- a/mindplot/src/main/javascript/DesignerUndoManager.js +++ b/mindplot/src/main/javascript/DesignerUndoManager.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/DragConnector.js b/mindplot/src/main/javascript/DragConnector.js index 150043f0..11893e1d 100644 --- a/mindplot/src/main/javascript/DragConnector.js +++ b/mindplot/src/main/javascript/DragConnector.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/DragManager.js b/mindplot/src/main/javascript/DragManager.js index 1af1dd53..4a9648e6 100644 --- a/mindplot/src/main/javascript/DragManager.js +++ b/mindplot/src/main/javascript/DragManager.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/DragPivot.js b/mindplot/src/main/javascript/DragPivot.js index c1cfce04..9758cfc4 100644 --- a/mindplot/src/main/javascript/DragPivot.js +++ b/mindplot/src/main/javascript/DragPivot.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/DragTopic.js b/mindplot/src/main/javascript/DragTopic.js index e7415630..a1750c64 100644 --- a/mindplot/src/main/javascript/DragTopic.js +++ b/mindplot/src/main/javascript/DragTopic.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/EditorOptions.js b/mindplot/src/main/javascript/EditorOptions.js index ccc533c5..e9bd1d3e 100644 --- a/mindplot/src/main/javascript/EditorOptions.js +++ b/mindplot/src/main/javascript/EditorOptions.js @@ -1,3 +1,21 @@ +/* + * Copyright [2012] [wisemapping] + * + * Licensed under WiseMapping Public License, Version 1.0 (the "License"). + * It is basically the Apache License, Version 2.0 (the "License") plus the + * "powered by wisemapping" text requirement on every single page; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the license at + * + * http://www.wisemapping.org/license + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + mindplot.EditorOptions = { LayoutManager:"OriginalLayout", diff --git a/mindplot/src/main/javascript/EditorProperties.js b/mindplot/src/main/javascript/EditorProperties.js index 0a650195..1fa148d7 100644 --- a/mindplot/src/main/javascript/EditorProperties.js +++ b/mindplot/src/main/javascript/EditorProperties.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/Icon.js b/mindplot/src/main/javascript/Icon.js index 2bd23e83..5d448e77 100644 --- a/mindplot/src/main/javascript/Icon.js +++ b/mindplot/src/main/javascript/Icon.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/IconGroup.js b/mindplot/src/main/javascript/IconGroup.js index cdc38f22..cfc0fa00 100644 --- a/mindplot/src/main/javascript/IconGroup.js +++ b/mindplot/src/main/javascript/IconGroup.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/ImageIcon.js b/mindplot/src/main/javascript/ImageIcon.js index f1812724..f0339cb9 100644 --- a/mindplot/src/main/javascript/ImageIcon.js +++ b/mindplot/src/main/javascript/ImageIcon.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/LinkIcon.js b/mindplot/src/main/javascript/LinkIcon.js index 839a8cef..6f820744 100644 --- a/mindplot/src/main/javascript/LinkIcon.js +++ b/mindplot/src/main/javascript/LinkIcon.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/LocalStorageManager.js b/mindplot/src/main/javascript/LocalStorageManager.js index a8ed69ee..5156413c 100644 --- a/mindplot/src/main/javascript/LocalStorageManager.js +++ b/mindplot/src/main/javascript/LocalStorageManager.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/MainTopic.js b/mindplot/src/main/javascript/MainTopic.js index f92920c7..2a94d1e3 100644 --- a/mindplot/src/main/javascript/MainTopic.js +++ b/mindplot/src/main/javascript/MainTopic.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/Messages.js b/mindplot/src/main/javascript/Messages.js index 1304fc34..bfa36cb1 100644 --- a/mindplot/src/main/javascript/Messages.js +++ b/mindplot/src/main/javascript/Messages.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/MultilineTextEditor.js b/mindplot/src/main/javascript/MultilineTextEditor.js index b1b730c9..b7cb9161 100644 --- a/mindplot/src/main/javascript/MultilineTextEditor.js +++ b/mindplot/src/main/javascript/MultilineTextEditor.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/NodeGraph.js b/mindplot/src/main/javascript/NodeGraph.js index daf2997c..f530cb70 100644 --- a/mindplot/src/main/javascript/NodeGraph.js +++ b/mindplot/src/main/javascript/NodeGraph.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/NoteIcon.js b/mindplot/src/main/javascript/NoteIcon.js index b6ae4562..e3b93985 100644 --- a/mindplot/src/main/javascript/NoteIcon.js +++ b/mindplot/src/main/javascript/NoteIcon.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/PersistenceManager.js b/mindplot/src/main/javascript/PersistenceManager.js index 84bc791d..76caaf18 100644 --- a/mindplot/src/main/javascript/PersistenceManager.js +++ b/mindplot/src/main/javascript/PersistenceManager.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/Relationship.js b/mindplot/src/main/javascript/Relationship.js index 690e7b14..105cd73e 100644 --- a/mindplot/src/main/javascript/Relationship.js +++ b/mindplot/src/main/javascript/Relationship.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/RelationshipPivot.js b/mindplot/src/main/javascript/RelationshipPivot.js index efc63918..3b9e0e66 100644 --- a/mindplot/src/main/javascript/RelationshipPivot.js +++ b/mindplot/src/main/javascript/RelationshipPivot.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/RestPersistenceManager.js b/mindplot/src/main/javascript/RestPersistenceManager.js index 747815b8..79842e32 100644 --- a/mindplot/src/main/javascript/RestPersistenceManager.js +++ b/mindplot/src/main/javascript/RestPersistenceManager.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/ScreenManager.js b/mindplot/src/main/javascript/ScreenManager.js index 010de117..f633b02f 100644 --- a/mindplot/src/main/javascript/ScreenManager.js +++ b/mindplot/src/main/javascript/ScreenManager.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/ShrinkConnector.js b/mindplot/src/main/javascript/ShrinkConnector.js index 1f177314..733f0e24 100644 --- a/mindplot/src/main/javascript/ShrinkConnector.js +++ b/mindplot/src/main/javascript/ShrinkConnector.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/StandaloneActionDispatcher.js b/mindplot/src/main/javascript/StandaloneActionDispatcher.js index 4d648740..1b1098ab 100644 --- a/mindplot/src/main/javascript/StandaloneActionDispatcher.js +++ b/mindplot/src/main/javascript/StandaloneActionDispatcher.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/TextEditor.js b/mindplot/src/main/javascript/TextEditor.js index 2b07b420..aabb3507 100644 --- a/mindplot/src/main/javascript/TextEditor.js +++ b/mindplot/src/main/javascript/TextEditor.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/TextEditorFactory.js b/mindplot/src/main/javascript/TextEditorFactory.js index 32ac8fdc..18c66d35 100644 --- a/mindplot/src/main/javascript/TextEditorFactory.js +++ b/mindplot/src/main/javascript/TextEditorFactory.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/Topic.js b/mindplot/src/main/javascript/Topic.js index 41c0c5ce..68f64aa5 100644 --- a/mindplot/src/main/javascript/Topic.js +++ b/mindplot/src/main/javascript/Topic.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/TopicEventDispatcher.js b/mindplot/src/main/javascript/TopicEventDispatcher.js index 90eea789..20476d10 100644 --- a/mindplot/src/main/javascript/TopicEventDispatcher.js +++ b/mindplot/src/main/javascript/TopicEventDispatcher.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/TopicFeature.js b/mindplot/src/main/javascript/TopicFeature.js index d6368d62..ed1130db 100644 --- a/mindplot/src/main/javascript/TopicFeature.js +++ b/mindplot/src/main/javascript/TopicFeature.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/Workspace.js b/mindplot/src/main/javascript/Workspace.js index 5e17d39a..859b41fc 100644 --- a/mindplot/src/main/javascript/Workspace.js +++ b/mindplot/src/main/javascript/Workspace.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/collaboration/CollaborationManager.js b/mindplot/src/main/javascript/collaboration/CollaborationManager.js index ff4a7ffb..80ea67a6 100644 --- a/mindplot/src/main/javascript/collaboration/CollaborationManager.js +++ b/mindplot/src/main/javascript/collaboration/CollaborationManager.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/collaboration/framework/AbstractCollaborativeModelFactory.js b/mindplot/src/main/javascript/collaboration/framework/AbstractCollaborativeModelFactory.js index d74c6c90..f1447359 100644 --- a/mindplot/src/main/javascript/collaboration/framework/AbstractCollaborativeModelFactory.js +++ b/mindplot/src/main/javascript/collaboration/framework/AbstractCollaborativeModelFactory.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/collaboration/framework/collab/BrixCollaborativeModelFactory.js b/mindplot/src/main/javascript/collaboration/framework/collab/BrixCollaborativeModelFactory.js index fb4d5a4a..cdcab900 100644 --- a/mindplot/src/main/javascript/collaboration/framework/collab/BrixCollaborativeModelFactory.js +++ b/mindplot/src/main/javascript/collaboration/framework/collab/BrixCollaborativeModelFactory.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/collaboration/framework/collab/BrixFramework.js b/mindplot/src/main/javascript/collaboration/framework/collab/BrixFramework.js index de9583e2..06cfecfa 100644 --- a/mindplot/src/main/javascript/collaboration/framework/collab/BrixFramework.js +++ b/mindplot/src/main/javascript/collaboration/framework/collab/BrixFramework.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/collaboration/framework/collab/model/Mindmap.js b/mindplot/src/main/javascript/collaboration/framework/collab/model/Mindmap.js index 19d16fa1..69566a51 100644 --- a/mindplot/src/main/javascript/collaboration/framework/collab/model/Mindmap.js +++ b/mindplot/src/main/javascript/collaboration/framework/collab/model/Mindmap.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/collaboration/framework/collab/model/NodeModel.js b/mindplot/src/main/javascript/collaboration/framework/collab/model/NodeModel.js index 98522c54..e3fe6cc2 100644 --- a/mindplot/src/main/javascript/collaboration/framework/collab/model/NodeModel.js +++ b/mindplot/src/main/javascript/collaboration/framework/collab/model/NodeModel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/commands/AddFeatureToTopicCommand.js b/mindplot/src/main/javascript/commands/AddFeatureToTopicCommand.js index f208c791..3852766f 100644 --- a/mindplot/src/main/javascript/commands/AddFeatureToTopicCommand.js +++ b/mindplot/src/main/javascript/commands/AddFeatureToTopicCommand.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/commands/AddRelationshipCommand.js b/mindplot/src/main/javascript/commands/AddRelationshipCommand.js index 3df8172e..ed1e4a5d 100644 --- a/mindplot/src/main/javascript/commands/AddRelationshipCommand.js +++ b/mindplot/src/main/javascript/commands/AddRelationshipCommand.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/commands/AddTopicCommand.js b/mindplot/src/main/javascript/commands/AddTopicCommand.js index be9f8475..c5c3870f 100644 --- a/mindplot/src/main/javascript/commands/AddTopicCommand.js +++ b/mindplot/src/main/javascript/commands/AddTopicCommand.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/commands/ChangeFeatureToTopicCommand.js b/mindplot/src/main/javascript/commands/ChangeFeatureToTopicCommand.js index 694a616d..f0fee9f7 100644 --- a/mindplot/src/main/javascript/commands/ChangeFeatureToTopicCommand.js +++ b/mindplot/src/main/javascript/commands/ChangeFeatureToTopicCommand.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/commands/DeleteCommand.js b/mindplot/src/main/javascript/commands/DeleteCommand.js index 7ed894b1..f160a19a 100644 --- a/mindplot/src/main/javascript/commands/DeleteCommand.js +++ b/mindplot/src/main/javascript/commands/DeleteCommand.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/commands/DragTopicCommand.js b/mindplot/src/main/javascript/commands/DragTopicCommand.js index bbf40119..986221cb 100644 --- a/mindplot/src/main/javascript/commands/DragTopicCommand.js +++ b/mindplot/src/main/javascript/commands/DragTopicCommand.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/commands/GenericFunctionCommand.js b/mindplot/src/main/javascript/commands/GenericFunctionCommand.js index 9488fab0..d52e5103 100644 --- a/mindplot/src/main/javascript/commands/GenericFunctionCommand.js +++ b/mindplot/src/main/javascript/commands/GenericFunctionCommand.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/commands/MoveControlPointCommand.js b/mindplot/src/main/javascript/commands/MoveControlPointCommand.js index 3419fe2b..96564599 100644 --- a/mindplot/src/main/javascript/commands/MoveControlPointCommand.js +++ b/mindplot/src/main/javascript/commands/MoveControlPointCommand.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/commands/RemoveFeatureFromTopicCommand.js b/mindplot/src/main/javascript/commands/RemoveFeatureFromTopicCommand.js index 1536f875..a8043164 100644 --- a/mindplot/src/main/javascript/commands/RemoveFeatureFromTopicCommand.js +++ b/mindplot/src/main/javascript/commands/RemoveFeatureFromTopicCommand.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/header.js b/mindplot/src/main/javascript/header.js index a62941dd..b5c0b76f 100644 --- a/mindplot/src/main/javascript/header.js +++ b/mindplot/src/main/javascript/header.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/layout/AbstractBasicSorter.js b/mindplot/src/main/javascript/layout/AbstractBasicSorter.js index 02a85969..fbfcad6d 100644 --- a/mindplot/src/main/javascript/layout/AbstractBasicSorter.js +++ b/mindplot/src/main/javascript/layout/AbstractBasicSorter.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/layout/BalancedSorter.js b/mindplot/src/main/javascript/layout/BalancedSorter.js index 55b8d02a..1c683616 100644 --- a/mindplot/src/main/javascript/layout/BalancedSorter.js +++ b/mindplot/src/main/javascript/layout/BalancedSorter.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/layout/ChangeEvent.js b/mindplot/src/main/javascript/layout/ChangeEvent.js index 057c1fa1..9e0dce84 100644 --- a/mindplot/src/main/javascript/layout/ChangeEvent.js +++ b/mindplot/src/main/javascript/layout/ChangeEvent.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/layout/ChildrenSorterStrategy.js b/mindplot/src/main/javascript/layout/ChildrenSorterStrategy.js index 26472e2c..e578ba7f 100644 --- a/mindplot/src/main/javascript/layout/ChildrenSorterStrategy.js +++ b/mindplot/src/main/javascript/layout/ChildrenSorterStrategy.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/layout/EventBus.js b/mindplot/src/main/javascript/layout/EventBus.js index a8d93fc9..a7ddd230 100644 --- a/mindplot/src/main/javascript/layout/EventBus.js +++ b/mindplot/src/main/javascript/layout/EventBus.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/layout/EventBusDispatcher.js b/mindplot/src/main/javascript/layout/EventBusDispatcher.js index e5e768f0..0b8f5d50 100644 --- a/mindplot/src/main/javascript/layout/EventBusDispatcher.js +++ b/mindplot/src/main/javascript/layout/EventBusDispatcher.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/layout/GridSorter.js b/mindplot/src/main/javascript/layout/GridSorter.js index 1d434bbc..9122b51c 100644 --- a/mindplot/src/main/javascript/layout/GridSorter.js +++ b/mindplot/src/main/javascript/layout/GridSorter.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/layout/LayoutManager.js b/mindplot/src/main/javascript/layout/LayoutManager.js index a10cc3b5..c7d6c86d 100644 --- a/mindplot/src/main/javascript/layout/LayoutManager.js +++ b/mindplot/src/main/javascript/layout/LayoutManager.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/layout/Node.js b/mindplot/src/main/javascript/layout/Node.js index fe7e379e..972a0a80 100644 --- a/mindplot/src/main/javascript/layout/Node.js +++ b/mindplot/src/main/javascript/layout/Node.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/layout/OriginalLayout.js b/mindplot/src/main/javascript/layout/OriginalLayout.js index 12612a2e..84d4c3f5 100644 --- a/mindplot/src/main/javascript/layout/OriginalLayout.js +++ b/mindplot/src/main/javascript/layout/OriginalLayout.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/layout/RootedTreeSet.js b/mindplot/src/main/javascript/layout/RootedTreeSet.js index e4ae17f5..c51f9e22 100644 --- a/mindplot/src/main/javascript/layout/RootedTreeSet.js +++ b/mindplot/src/main/javascript/layout/RootedTreeSet.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/layout/SymmetricSorter.js b/mindplot/src/main/javascript/layout/SymmetricSorter.js index ea9ed3e3..10604091 100644 --- a/mindplot/src/main/javascript/layout/SymmetricSorter.js +++ b/mindplot/src/main/javascript/layout/SymmetricSorter.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/model/FeatureModel.js b/mindplot/src/main/javascript/model/FeatureModel.js index a8bccec3..f28c1768 100644 --- a/mindplot/src/main/javascript/model/FeatureModel.js +++ b/mindplot/src/main/javascript/model/FeatureModel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/model/IMindmap.js b/mindplot/src/main/javascript/model/IMindmap.js index 3b3f0855..545a0355 100644 --- a/mindplot/src/main/javascript/model/IMindmap.js +++ b/mindplot/src/main/javascript/model/IMindmap.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/model/INodeModel.js b/mindplot/src/main/javascript/model/INodeModel.js index 2a8cbcd2..9e4fb96d 100644 --- a/mindplot/src/main/javascript/model/INodeModel.js +++ b/mindplot/src/main/javascript/model/INodeModel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/model/IconModel.js b/mindplot/src/main/javascript/model/IconModel.js index 80124d3a..aa6bca65 100644 --- a/mindplot/src/main/javascript/model/IconModel.js +++ b/mindplot/src/main/javascript/model/IconModel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/model/LinkModel.js b/mindplot/src/main/javascript/model/LinkModel.js index 259adc87..a04ed093 100644 --- a/mindplot/src/main/javascript/model/LinkModel.js +++ b/mindplot/src/main/javascript/model/LinkModel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/model/Mindmap.js b/mindplot/src/main/javascript/model/Mindmap.js index aca43a3d..345568bd 100644 --- a/mindplot/src/main/javascript/model/Mindmap.js +++ b/mindplot/src/main/javascript/model/Mindmap.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/model/NodeModel.js b/mindplot/src/main/javascript/model/NodeModel.js index e41b3d8f..89365805 100644 --- a/mindplot/src/main/javascript/model/NodeModel.js +++ b/mindplot/src/main/javascript/model/NodeModel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/model/NoteModel.js b/mindplot/src/main/javascript/model/NoteModel.js index 27b320fe..679d08ce 100644 --- a/mindplot/src/main/javascript/model/NoteModel.js +++ b/mindplot/src/main/javascript/model/NoteModel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/model/RelationshipModel.js b/mindplot/src/main/javascript/model/RelationshipModel.js index 6f26f1a5..55f909e7 100644 --- a/mindplot/src/main/javascript/model/RelationshipModel.js +++ b/mindplot/src/main/javascript/model/RelationshipModel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/persistence/Beta2PelaMigrator.js b/mindplot/src/main/javascript/persistence/Beta2PelaMigrator.js index cf8aaf8b..8c296bb5 100644 --- a/mindplot/src/main/javascript/persistence/Beta2PelaMigrator.js +++ b/mindplot/src/main/javascript/persistence/Beta2PelaMigrator.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/persistence/ModelCodeName.js b/mindplot/src/main/javascript/persistence/ModelCodeName.js index 28028a32..21b8758f 100644 --- a/mindplot/src/main/javascript/persistence/ModelCodeName.js +++ b/mindplot/src/main/javascript/persistence/ModelCodeName.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/persistence/Pela2TangoMigrator.js b/mindplot/src/main/javascript/persistence/Pela2TangoMigrator.js index c5e129c7..0b65ae32 100644 --- a/mindplot/src/main/javascript/persistence/Pela2TangoMigrator.js +++ b/mindplot/src/main/javascript/persistence/Pela2TangoMigrator.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/persistence/XMLSerializerFactory.js b/mindplot/src/main/javascript/persistence/XMLSerializerFactory.js index dba43285..c1740899 100644 --- a/mindplot/src/main/javascript/persistence/XMLSerializerFactory.js +++ b/mindplot/src/main/javascript/persistence/XMLSerializerFactory.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/persistence/XMLSerializer_Beta.js b/mindplot/src/main/javascript/persistence/XMLSerializer_Beta.js index 9f988b26..0d0e7cc0 100644 --- a/mindplot/src/main/javascript/persistence/XMLSerializer_Beta.js +++ b/mindplot/src/main/javascript/persistence/XMLSerializer_Beta.js @@ -1,4 +1,4 @@ -/* Copyright [2011] [wisemapping] +/* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/persistence/XMLSerializer_Pela.js b/mindplot/src/main/javascript/persistence/XMLSerializer_Pela.js index 3157fef7..95da6d9d 100644 --- a/mindplot/src/main/javascript/persistence/XMLSerializer_Pela.js +++ b/mindplot/src/main/javascript/persistence/XMLSerializer_Pela.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/persistence/XMLSerializer_Tango.js b/mindplot/src/main/javascript/persistence/XMLSerializer_Tango.js index 8db3adff..02e96616 100644 --- a/mindplot/src/main/javascript/persistence/XMLSerializer_Tango.js +++ b/mindplot/src/main/javascript/persistence/XMLSerializer_Tango.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/util/FadeEffect.js b/mindplot/src/main/javascript/util/FadeEffect.js index 7d9c0616..82a7fb0d 100644 --- a/mindplot/src/main/javascript/util/FadeEffect.js +++ b/mindplot/src/main/javascript/util/FadeEffect.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/util/Shape.js b/mindplot/src/main/javascript/util/Shape.js index ddbd9787..7abfabe4 100644 --- a/mindplot/src/main/javascript/util/Shape.js +++ b/mindplot/src/main/javascript/util/Shape.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/ColorPalettePanel.js b/mindplot/src/main/javascript/widget/ColorPalettePanel.js index 3246b0e0..252ecc5d 100644 --- a/mindplot/src/main/javascript/widget/ColorPalettePanel.js +++ b/mindplot/src/main/javascript/widget/ColorPalettePanel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/FloatingTip.js b/mindplot/src/main/javascript/widget/FloatingTip.js index 87d1483b..28aeeb57 100644 --- a/mindplot/src/main/javascript/widget/FloatingTip.js +++ b/mindplot/src/main/javascript/widget/FloatingTip.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/FontFamilyPanel.js b/mindplot/src/main/javascript/widget/FontFamilyPanel.js index fca4baa6..263dfd62 100644 --- a/mindplot/src/main/javascript/widget/FontFamilyPanel.js +++ b/mindplot/src/main/javascript/widget/FontFamilyPanel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/FontSizePanel.js b/mindplot/src/main/javascript/widget/FontSizePanel.js index d375b63c..b46c7acc 100644 --- a/mindplot/src/main/javascript/widget/FontSizePanel.js +++ b/mindplot/src/main/javascript/widget/FontSizePanel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/IMenu.js b/mindplot/src/main/javascript/widget/IMenu.js index 0bc89a90..902a6f5b 100644 --- a/mindplot/src/main/javascript/widget/IMenu.js +++ b/mindplot/src/main/javascript/widget/IMenu.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/IconPanel.js b/mindplot/src/main/javascript/widget/IconPanel.js index 6c9f67c6..f51ac33b 100644 --- a/mindplot/src/main/javascript/widget/IconPanel.js +++ b/mindplot/src/main/javascript/widget/IconPanel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/KeyboardShortcutTooltip.js b/mindplot/src/main/javascript/widget/KeyboardShortcutTooltip.js index 0e1b0054..575adefa 100644 --- a/mindplot/src/main/javascript/widget/KeyboardShortcutTooltip.js +++ b/mindplot/src/main/javascript/widget/KeyboardShortcutTooltip.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/LinkEditor.js b/mindplot/src/main/javascript/widget/LinkEditor.js index ddbd95d8..c320f5fc 100644 --- a/mindplot/src/main/javascript/widget/LinkEditor.js +++ b/mindplot/src/main/javascript/widget/LinkEditor.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/LinkIconTooltip.js b/mindplot/src/main/javascript/widget/LinkIconTooltip.js index 8ca0141a..a5df8ee1 100644 --- a/mindplot/src/main/javascript/widget/LinkIconTooltip.js +++ b/mindplot/src/main/javascript/widget/LinkIconTooltip.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/ListToolbarPanel.js b/mindplot/src/main/javascript/widget/ListToolbarPanel.js index 7d744ff6..583a2afa 100644 --- a/mindplot/src/main/javascript/widget/ListToolbarPanel.js +++ b/mindplot/src/main/javascript/widget/ListToolbarPanel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js index 0432d1de..7094b235 100644 --- a/mindplot/src/main/javascript/widget/Menu.js +++ b/mindplot/src/main/javascript/widget/Menu.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/ErrorNotifier.js b/mindplot/src/main/javascript/widget/ModalDialogNotifier.js similarity index 96% rename from mindplot/src/main/javascript/widget/ErrorNotifier.js rename to mindplot/src/main/javascript/widget/ModalDialogNotifier.js index fe0246d7..703dae98 100644 --- a/mindplot/src/main/javascript/widget/ErrorNotifier.js +++ b/mindplot/src/main/javascript/widget/ModalDialogNotifier.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/NoteEditor.js b/mindplot/src/main/javascript/widget/NoteEditor.js index 8caea4bb..f1906751 100644 --- a/mindplot/src/main/javascript/widget/NoteEditor.js +++ b/mindplot/src/main/javascript/widget/NoteEditor.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/ToolbarItem.js b/mindplot/src/main/javascript/widget/ToolbarItem.js index 5a49afce..edde65c2 100644 --- a/mindplot/src/main/javascript/widget/ToolbarItem.js +++ b/mindplot/src/main/javascript/widget/ToolbarItem.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/ToolbarNotifier.js b/mindplot/src/main/javascript/widget/ToolbarNotifier.js index fe0246d7..703dae98 100644 --- a/mindplot/src/main/javascript/widget/ToolbarNotifier.js +++ b/mindplot/src/main/javascript/widget/ToolbarNotifier.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/ToolbarPaneItem.js b/mindplot/src/main/javascript/widget/ToolbarPaneItem.js index b7a2ed78..287cedfe 100644 --- a/mindplot/src/main/javascript/widget/ToolbarPaneItem.js +++ b/mindplot/src/main/javascript/widget/ToolbarPaneItem.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/main/javascript/widget/TopicShapePanel.js b/mindplot/src/main/javascript/widget/TopicShapePanel.js index 70fa5394..b597414f 100644 --- a/mindplot/src/main/javascript/widget/TopicShapePanel.js +++ b/mindplot/src/main/javascript/widget/TopicShapePanel.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/test/javascript/static/test/BalancedTestSuite.js b/mindplot/src/test/javascript/static/test/BalancedTestSuite.js index 7b540855..4e9ceba0 100644 --- a/mindplot/src/test/javascript/static/test/BalancedTestSuite.js +++ b/mindplot/src/test/javascript/static/test/BalancedTestSuite.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/test/javascript/static/test/FreeTestSuite.js b/mindplot/src/test/javascript/static/test/FreeTestSuite.js index a17926f3..40ad2698 100644 --- a/mindplot/src/test/javascript/static/test/FreeTestSuite.js +++ b/mindplot/src/test/javascript/static/test/FreeTestSuite.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/test/javascript/static/test/SymmetricTestSuite.js b/mindplot/src/test/javascript/static/test/SymmetricTestSuite.js index ed650918..e2dd3a65 100644 --- a/mindplot/src/test/javascript/static/test/SymmetricTestSuite.js +++ b/mindplot/src/test/javascript/static/test/SymmetricTestSuite.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/mindplot/src/test/javascript/static/test/TestSuite.js b/mindplot/src/test/javascript/static/test/TestSuite.js index 2a693aa8..b0100019 100644 --- a/mindplot/src/test/javascript/static/test/TestSuite.js +++ b/mindplot/src/test/javascript/static/test/TestSuite.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/Arrow.js b/web2d/src/main/javascript/Arrow.js index 8f7912c7..33fabdb5 100644 --- a/web2d/src/main/javascript/Arrow.js +++ b/web2d/src/main/javascript/Arrow.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/CurvedLine.js b/web2d/src/main/javascript/CurvedLine.js index 61f9f0bb..0ddf05ea 100644 --- a/web2d/src/main/javascript/CurvedLine.js +++ b/web2d/src/main/javascript/CurvedLine.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/Element.js b/web2d/src/main/javascript/Element.js index 9ab06611..0fa9ca84 100644 --- a/web2d/src/main/javascript/Element.js +++ b/web2d/src/main/javascript/Element.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/Elipse.js b/web2d/src/main/javascript/Elipse.js index 93f520db..ba26514f 100644 --- a/web2d/src/main/javascript/Elipse.js +++ b/web2d/src/main/javascript/Elipse.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/Font.js b/web2d/src/main/javascript/Font.js index 41f8a12d..1be13fb3 100644 --- a/web2d/src/main/javascript/Font.js +++ b/web2d/src/main/javascript/Font.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/Group.js b/web2d/src/main/javascript/Group.js index c2dd64f0..20387b7d 100644 --- a/web2d/src/main/javascript/Group.js +++ b/web2d/src/main/javascript/Group.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/Image.js b/web2d/src/main/javascript/Image.js index 74441921..b9af98f5 100644 --- a/web2d/src/main/javascript/Image.js +++ b/web2d/src/main/javascript/Image.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/Line.js b/web2d/src/main/javascript/Line.js index b77c35d3..f8251b74 100644 --- a/web2d/src/main/javascript/Line.js +++ b/web2d/src/main/javascript/Line.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/Point.js b/web2d/src/main/javascript/Point.js index 0b4dd5e6..ffc1254a 100644 --- a/web2d/src/main/javascript/Point.js +++ b/web2d/src/main/javascript/Point.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/PolyLine.js b/web2d/src/main/javascript/PolyLine.js index 5c44d98a..ec485443 100644 --- a/web2d/src/main/javascript/PolyLine.js +++ b/web2d/src/main/javascript/PolyLine.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/Rect.js b/web2d/src/main/javascript/Rect.js index d71e0965..d3b667ec 100644 --- a/web2d/src/main/javascript/Rect.js +++ b/web2d/src/main/javascript/Rect.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/Text.js b/web2d/src/main/javascript/Text.js index 300fe4e7..440f45e9 100644 --- a/web2d/src/main/javascript/Text.js +++ b/web2d/src/main/javascript/Text.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/Toolkit.js b/web2d/src/main/javascript/Toolkit.js index 7c2e4292..294127d7 100644 --- a/web2d/src/main/javascript/Toolkit.js +++ b/web2d/src/main/javascript/Toolkit.js @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/Workspace.js b/web2d/src/main/javascript/Workspace.js index 158e1f5e..b9f16670 100644 --- a/web2d/src/main/javascript/Workspace.js +++ b/web2d/src/main/javascript/Workspace.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/header.js b/web2d/src/main/javascript/header.js index 89fa6cb1..44c495e6 100644 --- a/web2d/src/main/javascript/header.js +++ b/web2d/src/main/javascript/header.js @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/ArialFont.js b/web2d/src/main/javascript/peer/svg/ArialFont.js index 6488e997..f3ebbf2f 100644 --- a/web2d/src/main/javascript/peer/svg/ArialFont.js +++ b/web2d/src/main/javascript/peer/svg/ArialFont.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/ArrowPeer.js b/web2d/src/main/javascript/peer/svg/ArrowPeer.js index 60994fd8..ba96bd60 100644 --- a/web2d/src/main/javascript/peer/svg/ArrowPeer.js +++ b/web2d/src/main/javascript/peer/svg/ArrowPeer.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/CurvedLinePeer.js b/web2d/src/main/javascript/peer/svg/CurvedLinePeer.js index 545d4c14..20b6b4af 100644 --- a/web2d/src/main/javascript/peer/svg/CurvedLinePeer.js +++ b/web2d/src/main/javascript/peer/svg/CurvedLinePeer.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/ElementPeer.js b/web2d/src/main/javascript/peer/svg/ElementPeer.js index 0eca90ee..1966f5b7 100644 --- a/web2d/src/main/javascript/peer/svg/ElementPeer.js +++ b/web2d/src/main/javascript/peer/svg/ElementPeer.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/ElipsePeer.js b/web2d/src/main/javascript/peer/svg/ElipsePeer.js index 93c69270..84bf52bc 100644 --- a/web2d/src/main/javascript/peer/svg/ElipsePeer.js +++ b/web2d/src/main/javascript/peer/svg/ElipsePeer.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/Font.js b/web2d/src/main/javascript/peer/svg/Font.js index 5ce7e6bd..014334ea 100644 --- a/web2d/src/main/javascript/peer/svg/Font.js +++ b/web2d/src/main/javascript/peer/svg/Font.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/GroupPeer.js b/web2d/src/main/javascript/peer/svg/GroupPeer.js index 10b7ab69..001a7cd5 100644 --- a/web2d/src/main/javascript/peer/svg/GroupPeer.js +++ b/web2d/src/main/javascript/peer/svg/GroupPeer.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/ImagePeer.js b/web2d/src/main/javascript/peer/svg/ImagePeer.js index be9eed91..1a8e2582 100644 --- a/web2d/src/main/javascript/peer/svg/ImagePeer.js +++ b/web2d/src/main/javascript/peer/svg/ImagePeer.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/LinePeer.js b/web2d/src/main/javascript/peer/svg/LinePeer.js index cada8015..eb5c1e74 100644 --- a/web2d/src/main/javascript/peer/svg/LinePeer.js +++ b/web2d/src/main/javascript/peer/svg/LinePeer.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/PolyLinePeer.js b/web2d/src/main/javascript/peer/svg/PolyLinePeer.js index 69de2656..d67bb92b 100644 --- a/web2d/src/main/javascript/peer/svg/PolyLinePeer.js +++ b/web2d/src/main/javascript/peer/svg/PolyLinePeer.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/RectPeer.js b/web2d/src/main/javascript/peer/svg/RectPeer.js index 614e3845..226d0387 100644 --- a/web2d/src/main/javascript/peer/svg/RectPeer.js +++ b/web2d/src/main/javascript/peer/svg/RectPeer.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/TahomaFont.js b/web2d/src/main/javascript/peer/svg/TahomaFont.js index 5a2c7842..aefd38e6 100644 --- a/web2d/src/main/javascript/peer/svg/TahomaFont.js +++ b/web2d/src/main/javascript/peer/svg/TahomaFont.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/TextPeer.js b/web2d/src/main/javascript/peer/svg/TextPeer.js index f62b341c..f7ec4d7c 100644 --- a/web2d/src/main/javascript/peer/svg/TextPeer.js +++ b/web2d/src/main/javascript/peer/svg/TextPeer.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/TimesFont.js b/web2d/src/main/javascript/peer/svg/TimesFont.js index 0249cc37..b35d5093 100644 --- a/web2d/src/main/javascript/peer/svg/TimesFont.js +++ b/web2d/src/main/javascript/peer/svg/TimesFont.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/VerdanaFont.js b/web2d/src/main/javascript/peer/svg/VerdanaFont.js index 31caa48c..7166d2e3 100644 --- a/web2d/src/main/javascript/peer/svg/VerdanaFont.js +++ b/web2d/src/main/javascript/peer/svg/VerdanaFont.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/svg/WorkspacePeer.js b/web2d/src/main/javascript/peer/svg/WorkspacePeer.js index f91ed959..22ad1bd4 100644 --- a/web2d/src/main/javascript/peer/svg/WorkspacePeer.js +++ b/web2d/src/main/javascript/peer/svg/WorkspacePeer.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/utils/EventUtils.js b/web2d/src/main/javascript/peer/utils/EventUtils.js index 1ef9a12f..2df86fef 100644 --- a/web2d/src/main/javascript/peer/utils/EventUtils.js +++ b/web2d/src/main/javascript/peer/utils/EventUtils.js @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/main/javascript/peer/utils/TransformUtils.js b/web2d/src/main/javascript/peer/utils/TransformUtils.js index 202a78cc..5e0603a4 100644 --- a/web2d/src/main/javascript/peer/utils/TransformUtils.js +++ b/web2d/src/main/javascript/peer/utils/TransformUtils.js @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/web2d/src/test/javascript/render/utils.js b/web2d/src/test/javascript/render/utils.js index 6ab74e05..687a7238 100755 --- a/web2d/src/test/javascript/render/utils.js +++ b/web2d/src/test/javascript/render/utils.js @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-editor/src/main/webapp/js/editor.js b/wise-editor/src/main/webapp/js/editor.js index 0bc95301..f937f0e0 100644 --- a/wise-editor/src/main/webapp/js/editor.js +++ b/wise-editor/src/main/webapp/js/editor.js @@ -1,5 +1,5 @@ /* - * Copyright [2011] [wisemapping] + * Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java index 9ceeee48..25c4815a 100644 --- a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java +++ b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManager.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java index f23a7038..adb9ba88 100644 --- a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java +++ b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java b/wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java index 772ef1d5..6e169473 100644 --- a/wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java +++ b/wise-webapp/src/main/java/com/wisemapping/dao/UserManager.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java index 415c3554..36f51bfe 100644 --- a/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java +++ b/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/AccessDeniedSecurityException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/AccessDeniedSecurityException.java index b3fbba89..adeddcba 100755 --- a/wise-webapp/src/main/java/com/wisemapping/exceptions/AccessDeniedSecurityException.java +++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/AccessDeniedSecurityException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the @@ -27,7 +27,7 @@ public class AccessDeniedSecurityException public AccessDeniedSecurityException(@NotNull String msg) { - super(msg); + super(msg,Severity.FATAL); } @NotNull diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/ClientException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/ClientException.java index 35a8e239..0d60d1f7 100644 --- a/wise-webapp/src/main/java/com/wisemapping/exceptions/ClientException.java +++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/ClientException.java @@ -6,8 +6,11 @@ import org.springframework.context.MessageSource; import java.util.Locale; abstract public class ClientException extends WiseMappingException { - public ClientException(@NotNull String message) { + private Severity severity; + + public ClientException(@NotNull String message, @NotNull Severity severity) { super(message); + this.severity = severity; } protected abstract @@ -17,4 +20,8 @@ abstract public class ClientException extends WiseMappingException { public String getMessage(@NotNull final MessageSource messageSource, final @NotNull Locale locale) { return messageSource.getMessage(this.getMsgBundleKey(), null, locale); } + + public Severity getSeverity() { + return this.severity; + } } diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/EditionSessionExpiredException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/EditionSessionExpiredException.java index e34c4781..0f350694 100755 --- a/wise-webapp/src/main/java/com/wisemapping/exceptions/EditionSessionExpiredException.java +++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/EditionSessionExpiredException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the @@ -27,7 +27,7 @@ public class EditionSessionExpiredException public EditionSessionExpiredException(@NotNull String msg) { - super(msg); + super(msg,Severity.INFO); } @NotNull diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java index 2faad932..43c31aa2 100755 --- a/wise-webapp/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java +++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/EmailNotExistsException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/GoogleChromeFrameRequiredException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/GoogleChromeFrameRequiredException.java index 88394b29..06b1750e 100644 --- a/wise-webapp/src/main/java/com/wisemapping/exceptions/GoogleChromeFrameRequiredException.java +++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/GoogleChromeFrameRequiredException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/ImportUnexpectedException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/ImportUnexpectedException.java index ce0a67c0..ce2830bb 100755 --- a/wise-webapp/src/main/java/com/wisemapping/exceptions/ImportUnexpectedException.java +++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/ImportUnexpectedException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/LockException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/LockException.java index dff6efe0..d2e2924e 100755 --- a/wise-webapp/src/main/java/com/wisemapping/exceptions/LockException.java +++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/LockException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the @@ -24,7 +24,7 @@ public class LockException extends ClientException { public LockException(@NotNull String message) { - super(message); + super(message,Severity.INFO); } @NotNull diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/MultipleSessionsOpenException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/MultipleSessionsOpenException.java index 7014001e..ff3a13c7 100755 --- a/wise-webapp/src/main/java/com/wisemapping/exceptions/MultipleSessionsOpenException.java +++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/MultipleSessionsOpenException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the @@ -27,7 +27,7 @@ public class MultipleSessionsOpenException public MultipleSessionsOpenException(@NotNull String msg) { - super(msg); + super(msg,Severity.INFO); } @NotNull diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/SessionExpiredException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/SessionExpiredException.java index 392a5b90..c33bcd20 100755 --- a/wise-webapp/src/main/java/com/wisemapping/exceptions/SessionExpiredException.java +++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/SessionExpiredException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the @@ -20,15 +20,17 @@ package com.wisemapping.exceptions; import com.wisemapping.model.Collaborator; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public class SessionExpiredException - extends ClientException -{ + extends ClientException { public static final String MSG_KEY = "MINDMAP_TIMESTAMP_OUTDATED"; + @Nullable + private Collaborator lastUpdater; - public SessionExpiredException(@NotNull String msg,@NotNull Collaborator newEditor) - { - super(msg); + public SessionExpiredException(@Nullable Collaborator lastUpdater) { + super("Map has been updated by " + (lastUpdater != null ? lastUpdater.getEmail() : ""), Severity.FATAL); + this.lastUpdater = lastUpdater; } @NotNull diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/Severity.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/Severity.java new file mode 100644 index 00000000..1d02774c --- /dev/null +++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/Severity.java @@ -0,0 +1,25 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package com.wisemapping.exceptions; + +public enum Severity { + INFO, + WARNING, + SEVERE, + FATAL +} diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/UnsupportedBrowserException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/UnsupportedBrowserException.java index 9cbc603e..198e6fbf 100644 --- a/wise-webapp/src/main/java/com/wisemapping/exceptions/UnsupportedBrowserException.java +++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/UnsupportedBrowserException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/exceptions/WiseMappingException.java b/wise-webapp/src/main/java/com/wisemapping/exceptions/WiseMappingException.java index 1ef3d07b..8bc9581e 100755 --- a/wise-webapp/src/main/java/com/wisemapping/exceptions/WiseMappingException.java +++ b/wise-webapp/src/main/java/com/wisemapping/exceptions/WiseMappingException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportException.java b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportException.java index 3bee3a3d..920824a3 100755 --- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportException.java +++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java index 6ef65a11..7bc60eca 100644 --- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java +++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportFormat.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java index 0e15c6c5..2026135b 100644 --- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java +++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExportProperties.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/Exporter.java b/wise-webapp/src/main/java/com/wisemapping/exporter/Exporter.java index 0e8c66ac..f2b86523 100755 --- a/wise-webapp/src/main/java/com/wisemapping/exporter/Exporter.java +++ b/wise-webapp/src/main/java/com/wisemapping/exporter/Exporter.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java index e5ba98f9..6a473d75 100644 --- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java +++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java b/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java index 79ea6661..5b3da926 100755 --- a/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java +++ b/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/BrowserSupportInterceptor.java b/wise-webapp/src/main/java/com/wisemapping/filter/BrowserSupportInterceptor.java index ec25e574..eb1fda67 100644 --- a/wise-webapp/src/main/java/com/wisemapping/filter/BrowserSupportInterceptor.java +++ b/wise-webapp/src/main/java/com/wisemapping/filter/BrowserSupportInterceptor.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java b/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java index a187e920..adfe3954 100644 --- a/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java +++ b/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java b/wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java index e237b032..076a9860 100644 --- a/wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java +++ b/wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java b/wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java index 74728218..3db64877 100644 --- a/wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java +++ b/wise-webapp/src/main/java/com/wisemapping/filter/UserLocaleInterceptor.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/ImportFormat.java b/wise-webapp/src/main/java/com/wisemapping/importer/ImportFormat.java index b9c9e716..24cd182e 100755 --- a/wise-webapp/src/main/java/com/wisemapping/importer/ImportFormat.java +++ b/wise-webapp/src/main/java/com/wisemapping/importer/ImportFormat.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/Importer.java b/wise-webapp/src/main/java/com/wisemapping/importer/Importer.java index 85156237..fbae23e5 100755 --- a/wise-webapp/src/main/java/com/wisemapping/importer/Importer.java +++ b/wise-webapp/src/main/java/com/wisemapping/importer/Importer.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/ImporterException.java b/wise-webapp/src/main/java/com/wisemapping/importer/ImporterException.java index 4b90a41c..6000ea75 100755 --- a/wise-webapp/src/main/java/com/wisemapping/importer/ImporterException.java +++ b/wise-webapp/src/main/java/com/wisemapping/importer/ImporterException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/ImporterFactory.java b/wise-webapp/src/main/java/com/wisemapping/importer/ImporterFactory.java index c4f1a349..7542edf1 100755 --- a/wise-webapp/src/main/java/com/wisemapping/importer/ImporterFactory.java +++ b/wise-webapp/src/main/java/com/wisemapping/importer/ImporterFactory.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/JaxbCDATAMarshaller.java b/wise-webapp/src/main/java/com/wisemapping/importer/JaxbCDATAMarshaller.java index 8482b690..347a0d5d 100644 --- a/wise-webapp/src/main/java/com/wisemapping/importer/JaxbCDATAMarshaller.java +++ b/wise-webapp/src/main/java/com/wisemapping/importer/JaxbCDATAMarshaller.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.importer; import java.io.OutputStream; diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/VersionNumber.java b/wise-webapp/src/main/java/com/wisemapping/importer/VersionNumber.java index dd623e6d..1023b4bb 100644 --- a/wise-webapp/src/main/java/com/wisemapping/importer/VersionNumber.java +++ b/wise-webapp/src/main/java/com/wisemapping/importer/VersionNumber.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.importer; import java.util.*; diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java index b32c6a1c..1d6ccef0 100755 --- a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java +++ b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindIconConverter.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java index ab47ccca..d46b24ae 100755 --- a/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java +++ b/wise-webapp/src/main/java/com/wisemapping/importer/freemind/FreemindImporter.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java b/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java index 7234fc86..c82ffa81 100644 --- a/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java +++ b/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java index da6cb137..0ef7edfb 100644 --- a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java +++ b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/AccessAuditory.java b/wise-webapp/src/main/java/com/wisemapping/model/AccessAuditory.java index 939dc951..f72dd7fc 100755 --- a/wise-webapp/src/main/java/com/wisemapping/model/AccessAuditory.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/AccessAuditory.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java b/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java index 2a657e87..e9c5b982 100644 --- a/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/CollaborationEmail.java b/wise-webapp/src/main/java/com/wisemapping/model/CollaborationEmail.java index 01afe38c..50b1547d 100755 --- a/wise-webapp/src/main/java/com/wisemapping/model/CollaborationEmail.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/CollaborationEmail.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/CollaborationProperties.java b/wise-webapp/src/main/java/com/wisemapping/model/CollaborationProperties.java index 23393c6a..bde2f1b2 100644 --- a/wise-webapp/src/main/java/com/wisemapping/model/CollaborationProperties.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/CollaborationProperties.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/CollaborationRole.java b/wise-webapp/src/main/java/com/wisemapping/model/CollaborationRole.java index 3cad1fbc..f9c64398 100644 --- a/wise-webapp/src/main/java/com/wisemapping/model/CollaborationRole.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/CollaborationRole.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Collaborator.java b/wise-webapp/src/main/java/com/wisemapping/model/Collaborator.java index 2006ba40..b7c53d59 100755 --- a/wise-webapp/src/main/java/com/wisemapping/model/Collaborator.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/Collaborator.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Constants.java b/wise-webapp/src/main/java/com/wisemapping/model/Constants.java index 73492e98..c8d306ce 100755 --- a/wise-webapp/src/main/java/com/wisemapping/model/Constants.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/Constants.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Font.java b/wise-webapp/src/main/java/com/wisemapping/model/Font.java index 9e14ace8..42ff8adf 100755 --- a/wise-webapp/src/main/java/com/wisemapping/model/Font.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/Font.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java b/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java index 990dde63..e11abe2b 100755 --- a/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/IconFamily.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindMapCriteria.java b/wise-webapp/src/main/java/com/wisemapping/model/MindMapCriteria.java index fd89a61e..173260c3 100644 --- a/wise-webapp/src/main/java/com/wisemapping/model/MindMapCriteria.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/MindMapCriteria.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindMapHistory.java b/wise-webapp/src/main/java/com/wisemapping/model/MindMapHistory.java index 4abaa99e..234c66fc 100755 --- a/wise-webapp/src/main/java/com/wisemapping/model/MindMapHistory.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/MindMapHistory.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java b/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java index 98a58e7d..af83c458 100644 --- a/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/Mindmap.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java index 5fdd6b74..baea7a6e 100755 --- a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcon.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java index 209c849e..b02f8fc7 100755 --- a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java b/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java index 3f84dfaf..0681807d 100755 --- a/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/ShapeStyle.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/model/User.java b/wise-webapp/src/main/java/com/wisemapping/model/User.java index 4f350353..2b433ad7 100644 --- a/wise-webapp/src/main/java/com/wisemapping/model/User.java +++ b/wise-webapp/src/main/java/com/wisemapping/model/User.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java index da57582e..81a0f550 100644 --- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/ExtensionsController.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/LoginController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/LoginController.java index c34e7463..bfa4659e 100644 --- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/LoginController.java +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/LoginController.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java index dbae734f..4c7d4cca 100644 --- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/MindmapController.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java index 4ee9a1d0..d267617f 100644 --- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/PublicPagesController.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/ncontroller/UsersController.java b/wise-webapp/src/main/java/com/wisemapping/ncontroller/UsersController.java index 20f13c38..7ce07633 100644 --- a/wise-webapp/src/main/java/com/wisemapping/ncontroller/UsersController.java +++ b/wise-webapp/src/main/java/com/wisemapping/ncontroller/UsersController.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java b/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java index 05bb6c82..d25d655a 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java b/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java index 73bc1a85..d137025c 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java b/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java index 8b195ca5..1bf3ea6e 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the @@ -20,6 +20,7 @@ package com.wisemapping.rest; import com.wisemapping.exceptions.ClientException; import com.wisemapping.exceptions.ImportUnexpectedException; +import com.wisemapping.exceptions.Severity; import com.wisemapping.mail.NotificationService; import com.wisemapping.model.User; import com.wisemapping.rest.model.RestErrors; @@ -59,7 +60,7 @@ public class BaseController { @ResponseBody public RestErrors handleClientErrors(@NotNull IllegalArgumentException ex) { ex.printStackTrace(); - return new RestErrors(ex.getMessage()); + return new RestErrors(ex.getMessage(), Severity.SEVERE); } @ExceptionHandler(Exception.class) @@ -101,7 +102,7 @@ public class BaseController { if (cause instanceof ClientException) { result = handleClientErrors((ClientException) cause); } else { - result = new RestErrors(ex.getMessage()); + result = new RestErrors(ex.getMessage(), Severity.INFO); } return result; } @@ -110,6 +111,6 @@ public class BaseController { @ResponseStatus(HttpStatus.BAD_REQUEST) public RestErrors handleClientErrors(@NotNull ClientException ex) { final Locale locale = LocaleContextHolder.getLocale(); - return new RestErrors(ex.getMessage(messageSource, locale)); + return new RestErrors(ex.getMessage(messageSource, locale),ex.getSeverity()); } } diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/DebugMappingJacksonHttpMessageConverter.java b/wise-webapp/src/main/java/com/wisemapping/rest/DebugMappingJacksonHttpMessageConverter.java index d3487ddf..13d90cbf 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/DebugMappingJacksonHttpMessageConverter.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/DebugMappingJacksonHttpMessageConverter.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.rest; import org.apache.commons.io.IOUtils; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/JsonHttpMessageNotReadableException.java b/wise-webapp/src/main/java/com/wisemapping/rest/JsonHttpMessageNotReadableException.java index db078f3c..c58ba70c 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/JsonHttpMessageNotReadableException.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/JsonHttpMessageNotReadableException.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.rest; class JsonHttpMessageNotReadableException extends org.springframework.http.converter.HttpMessageNotReadableException { diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java index 5738aa15..e1ddb3fc 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the @@ -151,7 +151,7 @@ public class MindmapController extends BaseController { } // Could the map be updated ? - checkUpdate(mindmap, user, session, timestamp); + verifyLock(mindmap, user, session, timestamp); // Update collaboration properties ... final CollaborationProperties collaborationProperties = mindmap.findCollaborationProperties(user); @@ -174,30 +174,32 @@ public class MindmapController extends BaseController { return lockInfo.getTimestamp(); } - private void checkUpdate(@NotNull Mindmap mindmap, @NotNull User user, long session, long timestamp) throws WiseMappingException { - // The lock was lost, reclaim as the ownership of it. - final LockManager lockManager = mindmapService.getLockManager(); - final boolean lockLost = lockManager.isLocked(mindmap); - if (!lockLost) { - lockManager.lock(mindmap, user, session); - } + private void verifyLock(@NotNull Mindmap mindmap, @NotNull User user, long session, long timestamp) throws WiseMappingException { + throw new SessionExpiredException(user); - final LockInfo lockInfo = lockManager.getLockInfo(mindmap); - if (lockInfo.getCollaborator().equals(user)) { - final boolean outdated = mindmap.getLastModificationTime().getTimeInMillis() > timestamp; - if (lockInfo.getSession() == session) { - // Timestamp might not be returned to the client. This try to cover this case, ignoring the client timestamp check. - final User lastEditor = mindmap.getLastEditor(); - if (outdated && (lockInfo.getPreviousTimestamp() != timestamp || lastEditor == null || !lastEditor.equals(user))) { - throw new MultipleSessionsOpenException("The map has been updated and not by you. Session lost."); - } - } else if (outdated) { - throw new MultipleSessionsOpenException("The map has been updated and not by you. Session lost."); - } - } else { - throw new SessionExpiredException("You have lost the edition session", lockInfo.getCollaborator()); - - } +// // The lock was lost, reclaim as the ownership of it. +// final LockManager lockManager = mindmapService.getLockManager(); +// final boolean lockLost = lockManager.isLocked(mindmap); +// if (!lockLost) { +// lockManager.lock(mindmap, user, session); +// } +// +// final LockInfo lockInfo = lockManager.getLockInfo(mindmap); +// if (lockInfo.getCollaborator().equals(user)) { +// final boolean outdated = mindmap.getLastModificationTime().getTimeInMillis() > timestamp; +// if (lockInfo.getSession() == session) { +// // Timestamp might not be returned to the client. This try to cover this case, ignoring the client timestamp check. +// final User lastEditor = mindmap.getLastEditor(); +// if (outdated && (lockInfo.getPreviousTimestamp() != timestamp || lastEditor == null || !lastEditor.equals(user))) { +// throw new SessionExpiredException(lastEditor); +// } +// } else if (outdated) { +// throw new MultipleSessionsOpenException("The map has been updated and not by you. Session lost."); +// } +// } else { +// throw new SessionExpiredException(lockInfo.getCollaborator()); +// +// } } /** diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java index c9e4a87e..fb53e456 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java b/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java index 6fdfce86..ec250742 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/ValidationException.java b/wise-webapp/src/main/java/com/wisemapping/rest/ValidationException.java index 4016ccd7..c21a0b3e 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/ValidationException.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/ValidationException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaboration.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaboration.java index b9a9eab4..47c4724f 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaboration.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaboration.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.rest.model; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java index 5c0614eb..8f5f4cab 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborationList.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.rest.model; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborator.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborator.java index 687e7262..910fc873 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborator.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestCollaborator.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.rest.model; import com.wisemapping.model.Collaborator; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestErrors.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestErrors.java index c5e4ad96..d94b9e0b 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestErrors.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestErrors.java @@ -1,6 +1,24 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package com.wisemapping.rest.model; +import com.wisemapping.exceptions.Severity; import org.codehaus.jackson.annotate.JsonAutoDetect; import org.codehaus.jackson.annotate.JsonIgnore; import org.codehaus.jackson.annotate.JsonIgnoreProperties; @@ -35,6 +53,9 @@ public class RestErrors { @JsonIgnore MessageSource messageSource; + @JsonIgnore + Severity gSeverity; + public RestErrors() { } @@ -44,11 +65,13 @@ public class RestErrors { this.errors = errors; this.messageSource = messageSource; this.gErrors = this.processGlobalErrors(errors, messageSource); + this.gSeverity = Severity.WARNING; } - public RestErrors(@NotNull String errorMsg) { + public RestErrors(@NotNull String errorMsg, @NotNull Severity severity) { gErrors = new ArrayList(); gErrors.add(errorMsg); + this.gSeverity = severity; } private List processGlobalErrors(@NotNull Errors errors, @NotNull MessageSource messageSource) { @@ -84,5 +107,11 @@ public class RestErrors { // Implemented only for XML serialization contract ... } + public void setGlobalSeverity(@NotNull String severity) { + // Implemented only for XML serialization contract ... + } + public String getGlobalSeverity() { + return this.gSeverity.toString(); + } } diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLockInfo.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLockInfo.java index 0c0f21e4..7c635f16 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLockInfo.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLockInfo.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.rest.model; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLogItem.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLogItem.java index 0796ba5f..16340061 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLogItem.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLogItem.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.rest.model; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java index 8df2c781..9d8225ea 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmap.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.rest.model; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistory.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistory.java index f8422b84..64afc8e3 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistory.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistory.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.rest.model; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistoryList.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistoryList.java index 465cd4ff..0f8078b4 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistoryList.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapHistoryList.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.rest.model; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java index ed5e003c..1b3db88e 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.rest.model; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapList.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapList.java index 4a2001ff..2c86d563 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapList.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapList.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.rest.model; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java index 3a817149..c88402e5 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.rest.model; diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/view/ImportTransformationView.java b/wise-webapp/src/main/java/com/wisemapping/rest/view/ImportTransformationView.java index 8bc58bdd..20dfc4a6 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/view/ImportTransformationView.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/view/ImportTransformationView.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java b/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java index bfeeaf49..64f8b5ea 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationProvider.java b/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationProvider.java index 04ef95b3..364a789f 100644 --- a/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationProvider.java +++ b/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationProvider.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/security/CustomPasswordEncoder.java b/wise-webapp/src/main/java/com/wisemapping/security/CustomPasswordEncoder.java index b10f0219..3e3751ae 100755 --- a/wise-webapp/src/main/java/com/wisemapping/security/CustomPasswordEncoder.java +++ b/wise-webapp/src/main/java/com/wisemapping/security/CustomPasswordEncoder.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/security/UserDetails.java b/wise-webapp/src/main/java/com/wisemapping/security/UserDetails.java index cb09c68e..30530ad7 100644 --- a/wise-webapp/src/main/java/com/wisemapping/security/UserDetails.java +++ b/wise-webapp/src/main/java/com/wisemapping/security/UserDetails.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/security/UserDetailsService.java b/wise-webapp/src/main/java/com/wisemapping/security/UserDetailsService.java index 92dbf19a..0c1f1ab4 100644 --- a/wise-webapp/src/main/java/com/wisemapping/security/UserDetailsService.java +++ b/wise-webapp/src/main/java/com/wisemapping/security/UserDetailsService.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/security/Utils.java b/wise-webapp/src/main/java/com/wisemapping/security/Utils.java index 97ae2904..ed826c3a 100644 --- a/wise-webapp/src/main/java/com/wisemapping/security/Utils.java +++ b/wise-webapp/src/main/java/com/wisemapping/security/Utils.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/security/aop/BaseSecurityAdvice.java b/wise-webapp/src/main/java/com/wisemapping/security/aop/BaseSecurityAdvice.java index 2a6da5a8..3e8930fe 100755 --- a/wise-webapp/src/main/java/com/wisemapping/security/aop/BaseSecurityAdvice.java +++ b/wise-webapp/src/main/java/com/wisemapping/security/aop/BaseSecurityAdvice.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/security/aop/UpdateSecurityAdvise.java b/wise-webapp/src/main/java/com/wisemapping/security/aop/UpdateSecurityAdvise.java index 95c0b16a..4e562788 100755 --- a/wise-webapp/src/main/java/com/wisemapping/security/aop/UpdateSecurityAdvise.java +++ b/wise-webapp/src/main/java/com/wisemapping/security/aop/UpdateSecurityAdvise.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/security/aop/ViewBaseSecurityAdvise.java b/wise-webapp/src/main/java/com/wisemapping/security/aop/ViewBaseSecurityAdvise.java index 832e3195..7504d812 100755 --- a/wise-webapp/src/main/java/com/wisemapping/security/aop/ViewBaseSecurityAdvise.java +++ b/wise-webapp/src/main/java/com/wisemapping/security/aop/ViewBaseSecurityAdvise.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/service/CollaborationException.java b/wise-webapp/src/main/java/com/wisemapping/service/CollaborationException.java index 8adf3e16..0e459a7d 100755 --- a/wise-webapp/src/main/java/com/wisemapping/service/CollaborationException.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/CollaborationException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/service/HibernateAppListener.java b/wise-webapp/src/main/java/com/wisemapping/service/HibernateAppListener.java index 43604a86..3f25e2cb 100755 --- a/wise-webapp/src/main/java/com/wisemapping/service/HibernateAppListener.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/HibernateAppListener.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/service/HibernateUtil.java b/wise-webapp/src/main/java/com/wisemapping/service/HibernateUtil.java index 526c9f10..c76a5075 100755 --- a/wise-webapp/src/main/java/com/wisemapping/service/HibernateUtil.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/HibernateUtil.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/service/InvalidActivationCodeException.java b/wise-webapp/src/main/java/com/wisemapping/service/InvalidActivationCodeException.java index fca6c96d..9a7f48d9 100755 --- a/wise-webapp/src/main/java/com/wisemapping/service/InvalidActivationCodeException.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/InvalidActivationCodeException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/service/InvalidUserEmailException.java b/wise-webapp/src/main/java/com/wisemapping/service/InvalidUserEmailException.java index f47ad052..013691dd 100755 --- a/wise-webapp/src/main/java/com/wisemapping/service/InvalidUserEmailException.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/InvalidUserEmailException.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LockInfo.java b/wise-webapp/src/main/java/com/wisemapping/service/LockInfo.java index 56b0455a..e3cb76b8 100644 --- a/wise-webapp/src/main/java/com/wisemapping/service/LockInfo.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/LockInfo.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LockManager.java b/wise-webapp/src/main/java/com/wisemapping/service/LockManager.java index 8c8859ad..78ad7ad6 100644 --- a/wise-webapp/src/main/java/com/wisemapping/service/LockManager.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/LockManager.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java index a9bcf4b5..1e7d7c5a 100644 --- a/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java b/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java index 937fd1a3..b012c121 100755 --- a/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java index 9a897712..8f8d1791 100755 --- a/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/service/UserService.java b/wise-webapp/src/main/java/com/wisemapping/service/UserService.java index 19cde2e5..52d32752 100755 --- a/wise-webapp/src/main/java/com/wisemapping/service/UserService.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/UserService.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java index 7e111e95..26344abd 100755 --- a/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/util/JAXBUtils.java b/wise-webapp/src/main/java/com/wisemapping/util/JAXBUtils.java index 2197a71d..4c3c843a 100755 --- a/wise-webapp/src/main/java/com/wisemapping/util/JAXBUtils.java +++ b/wise-webapp/src/main/java/com/wisemapping/util/JAXBUtils.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java b/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java index 6413b02c..ca31852e 100755 --- a/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java +++ b/wise-webapp/src/main/java/com/wisemapping/util/ZipUtils.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/MapInfoValidator.java b/wise-webapp/src/main/java/com/wisemapping/validator/MapInfoValidator.java index 06d79430..e571df2e 100755 --- a/wise-webapp/src/main/java/com/wisemapping/validator/MapInfoValidator.java +++ b/wise-webapp/src/main/java/com/wisemapping/validator/MapInfoValidator.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java b/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java index c39f2575..fd1c5dd2 100644 --- a/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java +++ b/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java b/wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java index 82e5622b..0e58eff3 100644 --- a/wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java +++ b/wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/Utils.java b/wise-webapp/src/main/java/com/wisemapping/validator/Utils.java index 9909f6ec..3c4fbe29 100644 --- a/wise-webapp/src/main/java/com/wisemapping/validator/Utils.java +++ b/wise-webapp/src/main/java/com/wisemapping/validator/Utils.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/ValidatorUtils.java b/wise-webapp/src/main/java/com/wisemapping/validator/ValidatorUtils.java index b12f2d96..597c3e70 100755 --- a/wise-webapp/src/main/java/com/wisemapping/validator/ValidatorUtils.java +++ b/wise-webapp/src/main/java/com/wisemapping/validator/ValidatorUtils.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/view/ChangePasswordBean.java b/wise-webapp/src/main/java/com/wisemapping/view/ChangePasswordBean.java index 1b666ba0..4a0bdaaa 100644 --- a/wise-webapp/src/main/java/com/wisemapping/view/ChangePasswordBean.java +++ b/wise-webapp/src/main/java/com/wisemapping/view/ChangePasswordBean.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/view/CollaboratorBean.java b/wise-webapp/src/main/java/com/wisemapping/view/CollaboratorBean.java index 1b1b7648..f667617b 100755 --- a/wise-webapp/src/main/java/com/wisemapping/view/CollaboratorBean.java +++ b/wise-webapp/src/main/java/com/wisemapping/view/CollaboratorBean.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java b/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java index bf5f0fda..47fb206e 100644 --- a/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java +++ b/wise-webapp/src/main/java/com/wisemapping/view/MindMapBean.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/view/MindMapInfoBean.java b/wise-webapp/src/main/java/com/wisemapping/view/MindMapInfoBean.java index 247415a4..48d6f448 100644 --- a/wise-webapp/src/main/java/com/wisemapping/view/MindMapInfoBean.java +++ b/wise-webapp/src/main/java/com/wisemapping/view/MindMapInfoBean.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/java/com/wisemapping/view/UserBean.java b/wise-webapp/src/main/java/com/wisemapping/view/UserBean.java index 9b6776cd..10d46cff 100644 --- a/wise-webapp/src/main/java/com/wisemapping/view/UserBean.java +++ b/wise-webapp/src/main/java/com/wisemapping/view/UserBean.java @@ -1,5 +1,5 @@ /* -* Copyright [2011] [wisemapping] +* Copyright [2012] [wisemapping] * * Licensed under WiseMapping Public License, Version 1.0 (the "License"). * It is basically the Apache License, Version 2.0 (the "License") plus the diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties index 9097bd5f..e8bf5ea9 100644 --- a/wise-webapp/src/main/resources/messages_en.properties +++ b/wise-webapp/src/main/resources/messages_en.properties @@ -249,7 +249,7 @@ DIRECT_LINK_EXPLANATION=Copy and paste the link below to share your map with col TEMPORAL_PASSWORD_SENT=Your temporal password has been sent TEMPORAL_PASSWORD_SENT_DETAILS=We've sent you an email that will allow you to reset your password. Please check your email now. TEMPORAL_PASSWORD_SENT_SUPPORT=If you have any problem receiving the email, contact us to support@wisemapping.com -MINDMAP_TIMESTAMP_OUTDATED=It's not possible to save your changes because your mindmap is out of date. Refresh the page and try again. +MINDMAP_TIMESTAMP_OUTDATED=It's not possible to save your changes because your mindmap has been modified by '%s'. Refresh the page and try again. diff --git a/wise-webapp/src/test/java/com/wisemapping/test/rest/RestAdminITCase.java b/wise-webapp/src/test/java/com/wisemapping/test/rest/RestAdminITCase.java index 18890c86..12f4a1e7 100644 --- a/wise-webapp/src/test/java/com/wisemapping/test/rest/RestAdminITCase.java +++ b/wise-webapp/src/test/java/com/wisemapping/test/rest/RestAdminITCase.java @@ -1,3 +1,21 @@ +/* +* Copyright [2012] [wisemapping] +* +* Licensed under WiseMapping Public License, Version 1.0 (the "License"). +* It is basically the Apache License, Version 2.0 (the "License") plus the +* "powered by wisemapping" text requirement on every single page; +* you may not use this file except in compliance with the License. +* You may obtain a copy of the license at +* +* http://www.wisemapping.org/license +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + package com.wisemapping.test.rest;