From ed27dc2623a85ac92830a9526ee3997f8f634418 Mon Sep 17 00:00:00 2001 From: coalado Date: Tue, 28 Apr 2009 15:36:25 +0000 Subject: [PATCH] java 1.5 git-svn-id: svn://svn.jdownloader.org/jdownloader/trunk@5477 ebf7c1c2-ba36-0410-9fe8-c592906822b4 --- src/jd/CPluginWrapper.java | 2 +- src/jd/DecryptPluginWrapper.java | 2 +- src/jd/HostPluginWrapper.java | 2 +- src/jd/Installer.java | 2 +- src/jd/JDClassLoader.java | 8 +- src/jd/JDInit.java | 6 +- src/jd/Main.java | 23 +- src/jd/OptionalPluginWrapper.java | 4 +- src/jd/captcha/LetterComperator.java | 2 +- src/jd/captcha/configuration/Property.java | 2 +- src/jd/captcha/gui/BasicWindow.java | 4 +- src/jd/captcha/gui/ImageComponent.java | 2 +- src/jd/captcha/gui/ScrollPaneWindow.java | 6 +- src/jd/captcha/pixelgrid/Letter.java | 4 +- src/jd/captcha/pixelobject/PixelObject.java | 2 +- .../specials/MultiThreadDetection.java | 2 +- src/jd/captcha/utils/UTILITIES.java | 2 +- src/jd/config/Property.java | 2 +- src/jd/controlling/AccountManager.java | 8 +- src/jd/controlling/ClipboardHandler.java | 2 +- src/jd/controlling/DistributeData.java | 2 +- src/jd/controlling/DownloadController.java | 2 +- src/jd/controlling/DownloadWatchDog.java | 2 +- src/jd/controlling/LinkGrabberController.java | 2 +- src/jd/controlling/LogFormatter.java | 2 +- src/jd/controlling/ProgressController.java | 6 +- .../controlling/SingleDownloadController.java | 2 +- .../interaction/ExternExecute.java | 8 +- .../controlling/interaction/Interaction.java | 2 +- .../interaction/InteractionTrigger.java | 2 +- src/jd/controlling/interaction/JDExit.java | 8 +- .../interaction/PackageManager.java | 10 +- src/jd/controlling/interaction/ResetLink.java | 8 +- .../interaction/SimpleExecute.java | 8 +- .../controlling/reconnect/BatchReconnect.java | 6 +- .../reconnect/ExternReconnect.java | 6 +- .../controlling/reconnect/HTTPLiveHeader.java | 6 +- src/jd/crypt/Base64.java | 10 +- src/jd/event/ControlEvent.java | 4 +- src/jd/gui/JDLookAndFeelManager.java | 12 +- src/jd/gui/UserIO.java | 14 +- src/jd/gui/skins/simple/AddonPane.java | 4 +- src/jd/gui/skins/simple/AgbDialog.java | 2 +- src/jd/gui/skins/simple/ConvertDialog.java | 4 +- src/jd/gui/skins/simple/IconMenuBar.java | 2 +- src/jd/gui/skins/simple/InputDialog.java | 2 +- src/jd/gui/skins/simple/JDAboutDialog.java | 2 +- src/jd/gui/skins/simple/JDCollapser.java | 2 +- src/jd/gui/skins/simple/JDEventQueue.java | 10 +- src/jd/gui/skins/simple/JDMenuAction.java | 2 +- .../skins/simple/JDSubstanceTitlePane.java | 80 ++++++- src/jd/gui/skins/simple/JDToolBar.java | 4 +- src/jd/gui/skins/simple/LogPane.java | 6 +- src/jd/gui/skins/simple/PremiumStatus.java | 2 +- src/jd/gui/skins/simple/SimpleGUI.java | 30 +-- .../skins/simple/components/BrowseFile.java | 2 +- .../gui/skins/simple/components/ChartAPI.java | 4 +- .../components/ClickPositionDialog.java | 2 +- .../simple/components/ComboBrowseFile.java | 2 +- .../components/CountdownConfirmDialog.java | 2 +- .../DownloadView/DownloadLinksPanel.java | 4 +- .../DownloadView/DownloadTreeTable.java | 10 +- .../DownloadView/DownloadTreeTableModel.java | 8 +- .../DownloadView/TreeTableRenderer.java | 2 +- .../TreeTableTransferHandler.java | 10 +- .../skins/simple/components/DragNDrop.java | 2 +- .../simple/components/JDFileChooser.java | 4 +- .../simple/components/JDUnderlinedText.java | 4 +- .../skins/simple/components/JHelpDialog.java | 4 +- .../skins/simple/components/JLinkButton.java | 8 +- .../components/Linkgrabber/LinkAdder.java | 6 +- .../components/Linkgrabber/LinkCheck.java | 2 +- .../Linkgrabber/LinkGrabberFilePackage.java | 2 +- .../LinkGrabberFilePackageInfo.java | 4 +- .../Linkgrabber/LinkGrabberPanel.java | 4 +- .../Linkgrabber/LinkGrabberTreeTable.java | 4 +- .../LinkGrabberTreeTableModel.java | 6 +- .../LinkGrabberTreeTableRenderer.java | 2 +- .../LinkGrabberTreeTableTransferHandler.java | 10 +- .../simple/config/ConfigEntriesPanel.java | 6 +- .../gui/skins/simple/config/ConfigPanel.java | 2 +- .../panels/ConfigPanelEventmanager.java | 10 +- .../simple/config/panels/ConfigPanelGUI.java | 6 +- .../config/panels/ConfigPanelGeneral.java | 6 +- .../panels/ConfigPanelPluginForHost.java | 14 +- .../config/panels/ConfigPanelReconnect.java | 10 +- .../simple/config/subpanels/PremiumPanel.java | 10 +- .../subpanels/SubPanelCLRReconnect.java | 6 +- .../SubPanelLiveHeaderReconnect.java | 12 +- .../subpanels/SubPanelOptionalInstaller.java | 14 +- .../subpanels/SubPanelPluginsOptional.java | 14 +- .../simple/startmenu/actions/ExitAction.java | 2 +- .../startmenu/actions/RestartAction.java | 2 +- src/jd/gui/skins/simple/tasks/TaskButton.java | 8 +- src/jd/gui/skins/simple/tasks/TaskPanel.java | 2 +- src/jd/gui/userio/SimpleUserIO.java | 20 +- src/jd/gui/userio/dialog/AbstractDialog.java | 196 ++++++++++++++++++ src/jd/gui/userio/dialog/CaptchaDialog.java | 6 +- src/jd/gui/userio/dialog/ConfirmDialog.java | 136 ++---------- .../gui/userio/dialog/JCountdownDialog.java | 4 +- src/jd/http/Browser.java | 4 +- src/jd/http/download/HTTPDownload.java | 8 +- src/jd/http/requests/GetRequest.java | 4 +- src/jd/http/requests/PostFormDataRequest.java | 4 +- src/jd/http/requests/PostRequest.java | 4 +- src/jd/http/requests/Request.java | 6 +- src/jd/nutils/Executer.java | 4 +- src/jd/nutils/io/JDFileFilter.java | 4 +- src/jd/parser/Document.java | 2 +- src/jd/parser/Regex.java | 2 +- src/jd/plugins/Account.java | 2 +- src/jd/plugins/ContainerStatus.java | 2 +- src/jd/plugins/CryptedLink.java | 2 +- src/jd/plugins/DownloadLink.java | 4 +- src/jd/plugins/FilePackage.java | 4 +- src/jd/plugins/LinkStatus.java | 2 +- src/jd/plugins/PluginForDecrypt.java | 4 +- src/jd/plugins/PluginForHost.java | 6 +- src/jd/plugins/PluginOptional.java | 2 +- src/jd/plugins/PluginsC.java | 4 +- src/jd/plugins/decrypt/AllStreamInfo.java | 4 +- src/jd/plugins/decrypt/AlphaLink.java | 4 +- src/jd/plugins/decrypt/AnimeANet.java | 4 +- src/jd/plugins/decrypt/AnimeLoadsorg.java | 4 +- src/jd/plugins/decrypt/BadongoCom.java | 4 +- src/jd/plugins/decrypt/BestMovies.java | 4 +- src/jd/plugins/decrypt/BlogXXNet.java | 4 +- src/jd/plugins/decrypt/Bm4uin.java | 4 +- src/jd/plugins/decrypt/BrazilSeriesCom.java | 4 +- src/jd/plugins/decrypt/Charts4You.java | 4 +- src/jd/plugins/decrypt/CineTo.java | 4 +- src/jd/plugins/decrypt/ClipfishDe.java | 4 +- src/jd/plugins/decrypt/Collectr.java | 4 +- src/jd/plugins/decrypt/CounterstrikeDe.java | 4 +- src/jd/plugins/decrypt/CryptItCom.java | 4 +- src/jd/plugins/decrypt/CryptMeCom.java | 4 +- src/jd/plugins/decrypt/CryptingCC.java | 4 +- src/jd/plugins/decrypt/CryptingIt.java | 4 +- src/jd/plugins/decrypt/Cryptlinkws.java | 4 +- src/jd/plugins/decrypt/CrystalWarezIN.java | 4 +- src/jd/plugins/decrypt/DDLMusicOrg.java | 4 +- src/jd/plugins/decrypt/DreiDlAm.java | 4 +- src/jd/plugins/decrypt/EinsKhDe.java | 4 +- src/jd/plugins/decrypt/FDNLinksCom.java | 4 +- src/jd/plugins/decrypt/FalinksCom.java | 4 +- src/jd/plugins/decrypt/FileFactoryFolder.java | 4 +- src/jd/plugins/decrypt/FileUploadnet.java | 4 +- src/jd/plugins/decrypt/Filer.java | 4 +- src/jd/plugins/decrypt/FilmatoriumCn.java | 4 +- src/jd/plugins/decrypt/FreakShareFolder.java | 4 +- src/jd/plugins/decrypt/FrozenRomsIn.java | 4 +- src/jd/plugins/decrypt/GoogleGroups.java | 4 +- src/jd/plugins/decrypt/Gwarezcc.java | 4 +- src/jd/plugins/decrypt/HiderAthCx.java | 4 +- src/jd/plugins/decrypt/Hideurlbiz.java | 4 +- src/jd/plugins/decrypt/Hubuploadcom.java | 4 +- src/jd/plugins/decrypt/ILoadTo.java | 4 +- src/jd/plugins/decrypt/ImagefapCom.java | 4 +- src/jd/plugins/decrypt/JDLoader.java | 4 +- src/jd/plugins/decrypt/JamendoCom.java | 4 +- src/jd/plugins/decrypt/JokeAroundOrg.java | 4 +- src/jd/plugins/decrypt/KnofflCom.java | 4 +- src/jd/plugins/decrypt/LinkBankeu.java | 4 +- src/jd/plugins/decrypt/LinkBeeCom.java | 4 +- src/jd/plugins/decrypt/LinkBucks.java | 4 +- src/jd/plugins/decrypt/LinkCryptWs.java | 4 +- src/jd/plugins/decrypt/LinkProtectIn.java | 4 +- src/jd/plugins/decrypt/LinkProtectionOrg.java | 4 +- src/jd/plugins/decrypt/LinkProtectorCom.java | 4 +- src/jd/plugins/decrypt/LinkSafeWs.java | 4 +- src/jd/plugins/decrypt/LinkShareOrg.java | 4 +- src/jd/plugins/decrypt/LinkbaseBiz.java | 6 +- src/jd/plugins/decrypt/LinkcryptCom.java | 4 +- src/jd/plugins/decrypt/LinkrAt.java | 4 +- src/jd/plugins/decrypt/LinksaveIn.java | 6 +- src/jd/plugins/decrypt/Linkshield.java | 4 +- src/jd/plugins/decrypt/Lixin.java | 4 +- src/jd/plugins/decrypt/MediafireFolder.java | 4 +- .../plugins/decrypt/MegauploadComFolder.java | 4 +- src/jd/plugins/decrypt/MusicBaseWs.java | 4 +- src/jd/plugins/decrypt/MyRef.java | 4 +- src/jd/plugins/decrypt/MySpaceCom.java | 4 +- src/jd/plugins/decrypt/Myupcc.java | 4 +- src/jd/plugins/decrypt/MyvideoDe.java | 4 +- src/jd/plugins/decrypt/NetfolderIn.java | 4 +- src/jd/plugins/decrypt/NewsUrlDe.java | 4 +- src/jd/plugins/decrypt/NewzFindCom.java | 4 +- src/jd/plugins/decrypt/OneGabbaCom.java | 4 +- src/jd/plugins/decrypt/OutlinkrCom.java | 4 +- src/jd/plugins/decrypt/PaylesssoftsNet.java | 4 +- src/jd/plugins/decrypt/ProtectBoxIn.java | 4 +- src/jd/plugins/decrypt/ProtectLinksCom.java | 4 +- .../plugins/decrypt/ProtectTehparadoxcom.java | 4 +- src/jd/plugins/decrypt/ProtectorTO.java | 4 +- src/jd/plugins/decrypt/RaidrushOrg.java | 4 +- src/jd/plugins/decrypt/RapidFolderCom.java | 4 +- src/jd/plugins/decrypt/RapidLibrary.java | 4 +- src/jd/plugins/decrypt/RapidSpreadCom.java | 4 +- src/jd/plugins/decrypt/Rapidlayerin.java | 4 +- src/jd/plugins/decrypt/RapidsafeDe.java | 4 +- src/jd/plugins/decrypt/Rapidsafenet.java | 4 +- .../plugins/decrypt/RapidshareComFolder.java | 4 +- src/jd/plugins/decrypt/RapidshareMu.java | 4 +- src/jd/plugins/decrypt/RappersIn.java | 4 +- src/jd/plugins/decrypt/RbaDe.java | 4 +- src/jd/plugins/decrypt/Redirecter.java | 4 +- src/jd/plugins/decrypt/RelinkItCom.java | 4 +- src/jd/plugins/decrypt/RelinkUs.java | 4 +- src/jd/plugins/decrypt/RelinkaNet.java | 4 +- .../plugins/decrypt/RemixShareComFolder.java | 4 +- src/jd/plugins/decrypt/Rlslog.java | 4 +- src/jd/plugins/decrypt/RnB4Uin.java | 4 +- src/jd/plugins/decrypt/RockHouseIn.java | 4 +- src/jd/plugins/decrypt/RomHustlerNet.java | 4 +- src/jd/plugins/decrypt/RomsZopharNet.java | 4 +- src/jd/plugins/decrypt/RomscentralCom.java | 4 +- src/jd/plugins/decrypt/Rs43Com.java | 4 +- src/jd/plugins/decrypt/RsHoerbuchin.java | 4 +- src/jd/plugins/decrypt/RsLayerCom.java | 4 +- src/jd/plugins/decrypt/RsMonkeyCom.java | 4 +- src/jd/plugins/decrypt/RsXXXBlog.java | 4 +- src/jd/plugins/decrypt/RsprotectCom.java | 4 +- .../decrypt/Rsprotectfreehosterch.java | 4 +- src/jd/plugins/decrypt/SAUGUS.java | 4 +- src/jd/plugins/decrypt/SaveRaidrushWs.java | 4 +- .../plugins/decrypt/SavefileComProject.java | 4 +- src/jd/plugins/decrypt/ScumIn.java | 4 +- src/jd/plugins/decrypt/SdxCc.java | 4 +- src/jd/plugins/decrypt/SealedIn.java | 4 +- src/jd/plugins/decrypt/Secured.java | 6 +- src/jd/plugins/decrypt/Serienjunkies.java | 24 +-- src/jd/plugins/decrypt/Sexuriacom.java | 4 +- src/jd/plugins/decrypt/ShareBaseToFolder.java | 4 +- src/jd/plugins/decrypt/ShareProtect.java | 4 +- src/jd/plugins/decrypt/SharebankWs.java | 4 +- src/jd/plugins/decrypt/SpiegelDe.java | 4 +- src/jd/plugins/decrypt/SprezerCom.java | 4 +- src/jd/plugins/decrypt/Stealth.java | 4 +- src/jd/plugins/decrypt/SuperUploaderNet.java | 4 +- src/jd/plugins/decrypt/TechnorockerInfo.java | 4 +- src/jd/plugins/decrypt/UCMS.java | 4 +- src/jd/plugins/decrypt/URLCash.java | 4 +- src/jd/plugins/decrypt/UUCannaTo.java | 4 +- src/jd/plugins/decrypt/UpPicoasisNet.java | 4 +- src/jd/plugins/decrypt/UploadJockeycom.java | 4 +- src/jd/plugins/decrypt/UrlShieldnet.java | 4 +- src/jd/plugins/decrypt/UserCashCom.java | 4 +- src/jd/plugins/decrypt/VetaXin.java | 4 +- src/jd/plugins/decrypt/Web06de.java | 4 +- src/jd/plugins/decrypt/Wiireloaded.java | 4 +- src/jd/plugins/decrypt/Woireless6xTo.java | 4 +- src/jd/plugins/decrypt/Wordpress.java | 4 +- src/jd/plugins/decrypt/WrzutaPl.java | 4 +- src/jd/plugins/decrypt/Xailicom.java | 4 +- src/jd/plugins/decrypt/XenonLinkNet.java | 4 +- src/jd/plugins/decrypt/XinkIt.java | 4 +- src/jd/plugins/decrypt/XliceNet.java | 4 +- src/jd/plugins/decrypt/XrlUs.java | 4 +- src/jd/plugins/decrypt/XupInFolder.java | 4 +- src/jd/plugins/decrypt/YouPornCom.java | 4 +- src/jd/plugins/decrypt/YouTubeCom.java | 4 +- .../plugins/decrypt/YourFilesBizFolder.java | 4 +- src/jd/plugins/decrypt/Zero10Us.java | 4 +- src/jd/plugins/decrypt/ZeroSecWs.java | 4 +- src/jd/plugins/decrypt/rapidsharknet.java | 4 +- src/jd/plugins/download/RAFDownload.java | 8 +- src/jd/plugins/host/AddatHu.java | 22 +- src/jd/plugins/host/AdriveCom.java | 16 +- src/jd/plugins/host/ArchivTo.java | 16 +- src/jd/plugins/host/AxiFileCom.java | 16 +- src/jd/plugins/host/BadongoCom.java | 20 +- src/jd/plugins/host/BagrujCz.java | 16 +- src/jd/plugins/host/BluehostTo.java | 22 +- src/jd/plugins/host/ClipfishDe.java | 16 +- src/jd/plugins/host/DataHu.java | 24 +-- src/jd/plugins/host/Dataupde.java | 16 +- src/jd/plugins/host/DepositFiles.java | 24 +-- src/jd/plugins/host/DlFreeFr.java | 16 +- src/jd/plugins/host/DumpRu.java | 16 +- src/jd/plugins/host/EasyShareCom.java | 20 +- src/jd/plugins/host/EgoshareCom.java | 16 +- src/jd/plugins/host/EnteruploadCom.java | 16 +- src/jd/plugins/host/ExtraShareUs.java | 22 +- src/jd/plugins/host/FastShareorg.java | 16 +- src/jd/plugins/host/FileBaseTo.java | 16 +- src/jd/plugins/host/FileFactory.java | 26 +-- src/jd/plugins/host/FileFactoryPl.java | 16 +- src/jd/plugins/host/FileFrontCom.java | 16 +- src/jd/plugins/host/FileHostMecom.java | 20 +- src/jd/plugins/host/FileMojoCom.java | 16 +- src/jd/plugins/host/FileQubeCom.java | 16 +- src/jd/plugins/host/FileSendNet.java | 16 +- src/jd/plugins/host/FileUploadnet.java | 16 +- src/jd/plugins/host/FileloadUs.java | 16 +- src/jd/plugins/host/FilelobsterCom.java | 16 +- src/jd/plugins/host/FilerNet.java | 22 +- src/jd/plugins/host/FilesTo.java | 16 +- src/jd/plugins/host/FileshakerCom.java | 16 +- src/jd/plugins/host/FilestoreTo.java | 18 +- src/jd/plugins/host/FileuploadsharkCom.java | 16 +- src/jd/plugins/host/FilezzzCom.java | 16 +- src/jd/plugins/host/FourFreeLoadNet.java | 16 +- src/jd/plugins/host/FourSharedCom.java | 16 +- src/jd/plugins/host/Freaksharenet.java | 16 +- src/jd/plugins/host/GigaSizeCom.java | 24 +-- src/jd/plugins/host/GoogleGroups.java | 18 +- src/jd/plugins/host/HTTPAllgemein.java | 18 +- src/jd/plugins/host/HostPlikCom.java | 16 +- src/jd/plugins/host/HotFileCom.java | 12 +- src/jd/plugins/host/IFileIt.java | 16 +- src/jd/plugins/host/IfolderRu.java | 14 +- src/jd/plugins/host/ImageFap.java | 16 +- src/jd/plugins/host/JamendoCom.java | 14 +- src/jd/plugins/host/KewlshareCom.java | 18 +- src/jd/plugins/host/LeteckaPostaCz.java | 16 +- src/jd/plugins/host/LetitBitNet.java | 18 +- src/jd/plugins/host/LoadTo.java | 18 +- src/jd/plugins/host/MediafireCom.java | 16 +- src/jd/plugins/host/MegaShareCom.java | 16 +- src/jd/plugins/host/MegaroticCom.java | 24 +-- src/jd/plugins/host/MegasharesCom.java | 22 +- src/jd/plugins/host/Megauploadcom.java | 24 +-- src/jd/plugins/host/MeinUpload.java | 22 +- src/jd/plugins/host/MilleDriveCom.java | 16 +- src/jd/plugins/host/Moosharenet.java | 20 +- src/jd/plugins/host/MySpaceCom.java | 16 +- src/jd/plugins/host/MyVideo.java | 16 +- src/jd/plugins/host/Netloadin.java | 24 +-- src/jd/plugins/host/Odsiebiecom.java | 16 +- src/jd/plugins/host/OnlyFourFilesCom.java | 16 +- src/jd/plugins/host/PixelhitCom.java | 16 +- src/jd/plugins/host/PliczekNet.java | 16 +- src/jd/plugins/host/PlikosPl.java | 16 +- src/jd/plugins/host/PlikusPl.java | 18 +- src/jd/plugins/host/PrzeklejPl.java | 16 +- src/jd/plugins/host/Przeslijnet.java | 16 +- src/jd/plugins/host/QsaveInfo.java | 16 +- src/jd/plugins/host/QshareCom.java | 20 +- src/jd/plugins/host/RapidShareDe.java | 18 +- src/jd/plugins/host/RapidSharkPl.java | 16 +- src/jd/plugins/host/Rapidshare.java | 28 +-- src/jd/plugins/host/RappersIn.java | 14 +- src/jd/plugins/host/RbaDe.java | 12 +- src/jd/plugins/host/RemixShareCom.java | 16 +- src/jd/plugins/host/RomHustlerNet.java | 16 +- src/jd/plugins/host/RomsZopharNet.java | 16 +- src/jd/plugins/host/SavefileCom.java | 16 +- src/jd/plugins/host/SavefileRo.java | 16 +- src/jd/plugins/host/SelfLoadCom.java | 16 +- src/jd/plugins/host/SendSpacePl.java | 16 +- src/jd/plugins/host/SendspaceCom.java | 20 +- src/jd/plugins/host/ShareBaseTo.java | 20 +- src/jd/plugins/host/ShareBombCom.java | 20 +- src/jd/plugins/host/ShareGadgetCom.java | 16 +- src/jd/plugins/host/ShareNownet.java | 18 +- src/jd/plugins/host/ShareOnlineBiz.java | 20 +- src/jd/plugins/host/SharearoundCom.java | 16 +- src/jd/plugins/host/Shareplacecom.java | 16 +- src/jd/plugins/host/ShragleCom.java | 22 +- src/jd/plugins/host/SixGigaCom.java | 16 +- src/jd/plugins/host/SpeedShareOrg.java | 16 +- src/jd/plugins/host/SpeedyShareCom.java | 16 +- src/jd/plugins/host/Speedy_ShareCom.java | 16 +- src/jd/plugins/host/SpiegelDe.java | 14 +- src/jd/plugins/host/SuperSharePl.java | 16 +- src/jd/plugins/host/SwoopshareCom.java | 16 +- src/jd/plugins/host/TwoSharedCom.java | 16 +- src/jd/plugins/host/UpFileCom.java | 16 +- src/jd/plugins/host/UpMusicIn.java | 22 +- src/jd/plugins/host/UploadBoxCom.java | 14 +- src/jd/plugins/host/UploadDriveCom.java | 16 +- src/jd/plugins/host/UploadServiceinfo.java | 16 +- src/jd/plugins/host/UploadStube.java | 16 +- src/jd/plugins/host/Uploadedto.java | 22 +- src/jd/plugins/host/UploaderPl.java | 22 +- src/jd/plugins/host/UploadingCom.java | 24 +-- src/jd/plugins/host/UptalCom.java | 16 +- src/jd/plugins/host/VimeoCom.java | 16 +- src/jd/plugins/host/Vipfilecom.java | 18 +- src/jd/plugins/host/WrzucajCom.java | 16 +- src/jd/plugins/host/WrzutaPl.java | 16 +- src/jd/plugins/host/WyslijToPl.java | 16 +- src/jd/plugins/host/XsharewareCom.java | 16 +- src/jd/plugins/host/XupIn.java | 16 +- src/jd/plugins/host/XupInRaidrush.java | 16 +- src/jd/plugins/host/YouPornCom.java | 14 +- src/jd/plugins/host/YourFileSendercom.java | 16 +- src/jd/plugins/host/YourFilesBiz.java | 16 +- src/jd/plugins/host/Youtube.java | 20 +- src/jd/plugins/host/ZShareNet.java | 16 +- src/jd/plugins/host/ZetshareCom.java | 16 +- src/jd/plugins/host/Zippysharecom.java | 16 +- src/jd/plugins/optional/JDFolderWatch.java | 16 +- .../plugins/optional/JDGrowlNotification.java | 12 +- src/jd/plugins/optional/JDInfoFileWriter.java | 16 +- src/jd/plugins/optional/JDLowSpeed.java | 16 +- .../plugins/optional/JDPremiumCollector.java | 20 +- src/jd/plugins/optional/JDShutdown.java | 16 +- .../plugins/optional/hjsplit/JDHJSplit.java | 22 +- .../hjsplit/jaxe/CountingInputStream.java | 18 +- .../optional/hjsplit/jaxe/JAxeJoiner.java | 6 +- .../hjsplit/jaxe/SplitFileFilter.java | 4 +- .../hjsplit/jaxe/UnixSplitFileFilter.java | 4 +- .../hjsplit/jaxe/UnixSplitJoiner.java | 8 +- src/jd/plugins/optional/jdchat/JDChat.java | 26 +-- src/jd/plugins/optional/jdchat/User.java | 2 +- .../optional/jdtrayicon/JDLightTray.java | 14 +- .../optional/jdtrayicon/TrayIconTooltip.java | 2 +- src/jd/plugins/optional/jdunrar/JDUnrar.java | 24 +-- .../optional/langfileeditor/LFEGui.java | 20 +- .../langfileeditor/LangFileEditor.java | 18 +- .../plugins/optional/schedule/Schedule.java | 22 +- .../webinterface/JDSimpleWebserver.java | 2 +- .../optional/webinterface/JDWebinterface.java | 16 +- .../template/Tmpl/Element/Conditional.java | 8 +- .../template/Tmpl/Element/Loop.java | 8 +- .../template/Tmpl/Element/Var.java | 4 +- src/jd/router/FindRouterIP.java | 2 +- src/jd/router/GetRouterInfo.java | 16 +- src/jd/router/RouterData.java | 2 +- src/jd/router/reconnectrecorder/JDRRGui.java | 2 +- src/jd/utils/JDFileReg.java | 2 +- src/jd/utils/JDSounds.java | 2 +- src/jd/utils/JDUtilities.java | 12 +- src/sun/net/www/protocol/jdp/Handler.java | 2 +- src/sun/net/www/protocol/jdps/Handler.java | 2 +- tools/themekeys/themekeys/ThemeKeys.java | 6 +- 427 files changed, 2203 insertions(+), 2006 deletions(-) create mode 100644 src/jd/gui/userio/dialog/AbstractDialog.java diff --git a/src/jd/CPluginWrapper.java b/src/jd/CPluginWrapper.java index c2c5366f78..29883bc947 100644 --- a/src/jd/CPluginWrapper.java +++ b/src/jd/CPluginWrapper.java @@ -67,7 +67,7 @@ public class CPluginWrapper extends PluginWrapper { return null; } - @Override + //@Override public boolean canHandle(String data) { return getPlugin().canHandle(data); } diff --git a/src/jd/DecryptPluginWrapper.java b/src/jd/DecryptPluginWrapper.java index cc29a67948..c572df9386 100644 --- a/src/jd/DecryptPluginWrapper.java +++ b/src/jd/DecryptPluginWrapper.java @@ -36,7 +36,7 @@ public class DecryptPluginWrapper extends PluginWrapper { this(host, className, patternSupported, 0); } - @Override + //@Override public PluginForDecrypt getPlugin() { return (PluginForDecrypt) super.getPlugin(); } diff --git a/src/jd/HostPluginWrapper.java b/src/jd/HostPluginWrapper.java index e24ebd84c7..f1dda1ac62 100644 --- a/src/jd/HostPluginWrapper.java +++ b/src/jd/HostPluginWrapper.java @@ -38,7 +38,7 @@ public class HostPluginWrapper extends PluginWrapper { this(host, className, patternSupported, 0); } - @Override + //@Override public PluginForHost getPlugin() { return (PluginForHost) super.getPlugin(); } diff --git a/src/jd/Installer.java b/src/jd/Installer.java index 4367986dea..d4e5ff986f 100644 --- a/src/jd/Installer.java +++ b/src/jd/Installer.java @@ -84,7 +84,7 @@ public class Installer { // logger.info("ConfigDialog"); new GuiRunnable() { - @Override + //@Override public Object runSave() { ConfigEntriesPanel p = new ConfigEntriesPanel(configContainer); JPanel panel = new JPanel(new BorderLayout()); diff --git a/src/jd/JDClassLoader.java b/src/jd/JDClassLoader.java index 40f00b1b0a..cc3d9d2dc2 100644 --- a/src/jd/JDClassLoader.java +++ b/src/jd/JDClassLoader.java @@ -180,7 +180,7 @@ public class JDClassLoader extends java.lang.ClassLoader { return null; } - @Override + //@Override protected URL findResource(String name) { URL url; @@ -231,7 +231,7 @@ public class JDClassLoader extends java.lang.ClassLoader { return null; } - @Override + //@Override public URL getResource(String name) { if (jars != null) { @@ -267,7 +267,7 @@ public class JDClassLoader extends java.lang.ClassLoader { return null; } - @Override + //@Override public Enumeration getResources(String name) throws IOException { Vector urls = new Vector(); @@ -312,7 +312,7 @@ public class JDClassLoader extends java.lang.ClassLoader { * System-Classloader geladen werden kann. Erst zum Schluß wird versucht, * diese Klasse selbst zu laden. */ - @Override + //@Override protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException { Class c = findLoadedClass(name); if (c == null) { diff --git a/src/jd/JDInit.java b/src/jd/JDInit.java index 8d794fc668..2b29564d35 100644 --- a/src/jd/JDInit.java +++ b/src/jd/JDInit.java @@ -233,7 +233,7 @@ public class JDInit { new GuiRunnable() { - @Override + //@Override public Object runSave() { JOptionPane.showMessageDialog(null, JDLocale.L("installer.welcome", "Welcome to jDownloader.")); return null; @@ -261,7 +261,7 @@ public class JDInit { new GuiRunnable() { - @Override + //@Override public Object runSave() { JOptionPane.showMessageDialog(new JFrame(), JDLocale.L("installer.error.noWriteRights", "Error. You do not have permissions to write to the dir")); return null; @@ -276,7 +276,7 @@ public class JDInit { logger.severe("INSTALL abgebrochen2"); new GuiRunnable() { - @Override + //@Override public Object runSave() { JOptionPane.showMessageDialog(new JFrame(), JDLocale.L("installer.abortInstallation", "Error. User aborted installation.")); return null; diff --git a/src/jd/Main.java b/src/jd/Main.java index 38bc5baea2..67789768c0 100644 --- a/src/jd/Main.java +++ b/src/jd/Main.java @@ -37,6 +37,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.imageio.ImageIO; +import javax.swing.ImageIcon; import javax.swing.JFrame; import javax.swing.JOptionPane; @@ -54,6 +55,7 @@ import jd.gui.UserIO; import jd.gui.skins.simple.GuiRunnable; import jd.gui.skins.simple.JDEventQueue; import jd.gui.skins.simple.SimpleGuiConstants; +import jd.gui.skins.simple.components.JLinkButton; import jd.gui.userio.SimpleUserIO; import jd.http.Browser; import jd.http.URLConnectionAdapter; @@ -163,9 +165,9 @@ public class Main { JDInitFlags.SWITCH_RETURNED_FROM_UPDATE = true; } } - - preInitChecks(); UserIO.setInstance(SimpleUserIO.getInstance()); + preInitChecks(); + for (int i = 0; i < args.length; i++) { if (args[i].equals("-prot")) { @@ -260,7 +262,7 @@ public class Main { LOGGER.info("init Splash"); new GuiRunnable() { - @Override + // @Override public Object runSave() { try { splashScreen = new SplashScreen(JDTheme.I("gui.splash")); @@ -348,6 +350,19 @@ public class Main { LOGGER.warning("Javacheck: Wrong Java Version! JDownloader needs at least Java 1.5 or higher!"); System.exit(0); } + if(JDUtilities.getJavaVersion()<1.6 && !OSDetector.isMac()){ + int returnValue = UserIO.getInstance().requestConfirmDialog(UserIO.DONT_SHOW_AGAIN|UserIO.NO_CANCEL_OPTION,JDLocale.LF("gui.javacheck.newerjavaavailable.title","Outdated Javaversion found: %s!",JDUtilities.getJavaVersion()), JDLocale.L("gui.javacheck.newerjavaavailable.msg","Although JDownloader runs on your javaversion, we advise to install the latest java updates. \r\nJDownloader will run more stable, faster, and will look better. \r\n\r\nVisit http://jdownloader.org/download."), JDTheme.II("gui.images.warning",32,32), null,null); + if((returnValue&UserIO.RETURN_SKIPPED_BY_DONT_SHOW)==0){ + try { + JLinkButton.openURL("http://jdownloader.org/download/index?updatejava=1"); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + } + } @@ -423,7 +438,7 @@ public class Main { Main.increaseSplashStatus(); new GuiRunnable() { - @Override + // @Override public Object runSave() { init.initGUI(controller); return null; diff --git a/src/jd/OptionalPluginWrapper.java b/src/jd/OptionalPluginWrapper.java index f72aef0cbd..0b887114d1 100644 --- a/src/jd/OptionalPluginWrapper.java +++ b/src/jd/OptionalPluginWrapper.java @@ -62,7 +62,7 @@ public class OptionalPluginWrapper extends PluginWrapper { this.flag = flag; } - @Override + //@Override public PluginOptional getPlugin() { return (PluginOptional) loadedPlugin; } @@ -116,7 +116,7 @@ public class OptionalPluginWrapper extends PluginWrapper { return "OPTIONAL_PLUGIN_" + loadedPlugin.getHost(); } - @Override + //@Override public int compareTo(PluginWrapper plg) { return getPlugin().getHost().toLowerCase().compareTo(plg.getPlugin().getHost().toLowerCase()); } diff --git a/src/jd/captcha/LetterComperator.java b/src/jd/captcha/LetterComperator.java index 20a1afe5e4..e6f38bed5e 100644 --- a/src/jd/captcha/LetterComperator.java +++ b/src/jd/captcha/LetterComperator.java @@ -1226,7 +1226,7 @@ public class LetterComperator { * * @return parameterstring */ - @Override + //@Override public String toString() { Hashtable hs = new Hashtable(); // if(getDecodedValue().equalsIgnoreCase("v")&&getBothElementsNum()==3){ diff --git a/src/jd/captcha/configuration/Property.java b/src/jd/captcha/configuration/Property.java index dd860102da..b25c1bb6d7 100644 --- a/src/jd/captcha/configuration/Property.java +++ b/src/jd/captcha/configuration/Property.java @@ -253,7 +253,7 @@ public class Property implements Serializable { * * @return PropertyString */ - @Override + //@Override public String toString() { return "Property(" + saveCount + "): " + properties; } diff --git a/src/jd/captcha/gui/BasicWindow.java b/src/jd/captcha/gui/BasicWindow.java index fe82a22da3..4fb9220379 100644 --- a/src/jd/captcha/gui/BasicWindow.java +++ b/src/jd/captcha/gui/BasicWindow.java @@ -260,7 +260,7 @@ public class BasicWindow extends JFrame { private void initWindow() { final BasicWindow _this = this; addWindowListener(new WindowAdapter() { - @Override + //@Override public void windowClosing(WindowEvent event) { Window window = event.getWindow(); _this.setVisible(true); @@ -278,7 +278,7 @@ public class BasicWindow extends JFrame { setBackground(Color.LIGHT_GRAY); } - @Override + //@Override public void pack() { try { super.pack(); diff --git a/src/jd/captcha/gui/ImageComponent.java b/src/jd/captcha/gui/ImageComponent.java index 9d87db7629..ebd9938499 100644 --- a/src/jd/captcha/gui/ImageComponent.java +++ b/src/jd/captcha/gui/ImageComponent.java @@ -68,7 +68,7 @@ public class ImageComponent extends JComponent { * * @param g */ - @Override + //@Override public void paintComponent(Graphics g) { g.drawImage(image, 0, 0, null); } diff --git a/src/jd/captcha/gui/ScrollPaneWindow.java b/src/jd/captcha/gui/ScrollPaneWindow.java index 68ff9e7c36..93aeeae204 100644 --- a/src/jd/captcha/gui/ScrollPaneWindow.java +++ b/src/jd/captcha/gui/ScrollPaneWindow.java @@ -63,7 +63,7 @@ public class ScrollPaneWindow extends BasicWindow { * @param y * @param cmp */ - @Override + //@Override public void setComponent(final int x, final int y, final Component cmp) { if (cmp == null) { return; } SwingUtilities.invokeLater(new Runnable() { @@ -81,7 +81,7 @@ public class ScrollPaneWindow extends BasicWindow { * @param y * @param img */ - @Override + //@Override public void setImage(final int x, final int y, final Image img) { if (img == null) { return; } SwingUtilities.invokeLater(new Runnable() { @@ -99,7 +99,7 @@ public class ScrollPaneWindow extends BasicWindow { * @param y * @param cmp */ - @Override + //@Override public void setText(final int x, final int y, final Object cmp) { if (cmp == null) { return; // final ScrollPaneWindow _this=this; diff --git a/src/jd/captcha/pixelgrid/Letter.java b/src/jd/captcha/pixelgrid/Letter.java index a132841a7a..bdd5ac4d1b 100644 --- a/src/jd/captcha/pixelgrid/Letter.java +++ b/src/jd/captcha/pixelgrid/Letter.java @@ -813,7 +813,7 @@ public class Letter extends PixelGrid { * @param owner * the owner to set */ - @Override + //@Override public void setOwner(JAntiCaptcha owner) { this.owner = owner; } @@ -878,7 +878,7 @@ public class Letter extends PixelGrid { return object; } - @Override + //@Override public String toString() { return getDecodedValue() + " [" + getSourcehash() + "][" + getGoodDetections() + "/" + getBadDetections() + "]"; } diff --git a/src/jd/captcha/pixelobject/PixelObject.java b/src/jd/captcha/pixelobject/PixelObject.java index b9d607af60..c7cd517d64 100644 --- a/src/jd/captcha/pixelobject/PixelObject.java +++ b/src/jd/captcha/pixelobject/PixelObject.java @@ -613,7 +613,7 @@ public class PixelObject implements Comparable { } - @Override + //@Override public String toString() { return super.toString() + " " + getLocation()[0] + "-" + getLocation()[1]; } diff --git a/src/jd/captcha/specials/MultiThreadDetection.java b/src/jd/captcha/specials/MultiThreadDetection.java index 953f402f20..fd84d246e0 100644 --- a/src/jd/captcha/specials/MultiThreadDetection.java +++ b/src/jd/captcha/specials/MultiThreadDetection.java @@ -31,7 +31,7 @@ public class MultiThreadDetection { letter = l; } - @Override + //@Override public void run() { letter.detected = jac.getLetter(letter); startDetection(this); diff --git a/src/jd/captcha/utils/UTILITIES.java b/src/jd/captcha/utils/UTILITIES.java index ddd5762ba9..e43852322f 100644 --- a/src/jd/captcha/utils/UTILITIES.java +++ b/src/jd/captcha/utils/UTILITIES.java @@ -176,7 +176,7 @@ public class UTILITIES { */ public static Image loadImage(final File file) { GuiRunnable run = new GuiRunnable() { - @Override + //@Override public Image runSave() { JFrame jf = new JFrame(); Image img = jf.getToolkit().getImage(file.getAbsolutePath()); diff --git a/src/jd/config/Property.java b/src/jd/config/Property.java index 834ac32138..6e4ee49b84 100644 --- a/src/jd/config/Property.java +++ b/src/jd/config/Property.java @@ -312,7 +312,7 @@ public class Property implements Serializable { * * @return PropertyString */ - @Override + //@Override public String toString() { if (properties.size() == 0) return ""; return "Property(" + saveCount + "): " + properties; diff --git a/src/jd/controlling/AccountManager.java b/src/jd/controlling/AccountManager.java index 7a9c57bb5d..7a573732f5 100644 --- a/src/jd/controlling/AccountManager.java +++ b/src/jd/controlling/AccountManager.java @@ -24,7 +24,7 @@ public class AccountManager extends SubConfiguration implements ControlListener super("AccountManager"); this.broadcaster = new JDBroadcaster() { - @Override + //@Override protected void fireEvent(AccountListener listener, AccountsUpdateEvent event) { listener.onUpdate(); } @@ -98,13 +98,13 @@ public class AccountManager extends SubConfiguration implements ControlListener return ret; } - @Override + //@Override public synchronized void setProperty(String key, Object value) { init(); super.setProperty(key, value); } - @Override + //@Override public Object getProperty(String key, Object def) { init(); return super.getProperty(key, def); @@ -127,7 +127,7 @@ public class AccountManager extends SubConfiguration implements ControlListener } - @Override + //@Override public void save() { init(); super.save(); diff --git a/src/jd/controlling/ClipboardHandler.java b/src/jd/controlling/ClipboardHandler.java index d73a876b90..cac7c83766 100644 --- a/src/jd/controlling/ClipboardHandler.java +++ b/src/jd/controlling/ClipboardHandler.java @@ -79,7 +79,7 @@ public class ClipboardHandler extends Thread implements ControlListener { return JDUtilities.getConfiguration().getBooleanProperty(Configuration.PARAM_CLIPBOARD_ALWAYS_ACTIVE, false); } - @Override + //@Override public void run() { while (true) { waitFlag = true; diff --git a/src/jd/controlling/DistributeData.java b/src/jd/controlling/DistributeData.java index 7c9144f654..c583022688 100644 --- a/src/jd/controlling/DistributeData.java +++ b/src/jd/controlling/DistributeData.java @@ -387,7 +387,7 @@ public class DistributeData extends Thread { } } - @Override + //@Override public void run() { Vector links = findLinks(); diff --git a/src/jd/controlling/DownloadController.java b/src/jd/controlling/DownloadController.java index 1859b02756..5f883dfa38 100644 --- a/src/jd/controlling/DownloadController.java +++ b/src/jd/controlling/DownloadController.java @@ -28,7 +28,7 @@ import jd.utils.JDUtilities; class DownloadControllerBroadcaster extends JDBroadcaster { - @Override + //@Override protected void fireEvent(DownloadControllerListener listener, DownloadControllerEvent event) { listener.onDownloadControllerEvent(event); diff --git a/src/jd/controlling/DownloadWatchDog.java b/src/jd/controlling/DownloadWatchDog.java index cf3792ec27..66a60ebf1f 100644 --- a/src/jd/controlling/DownloadWatchDog.java +++ b/src/jd/controlling/DownloadWatchDog.java @@ -343,7 +343,7 @@ if(value){ } - @Override + //@Override public void run() { Vector links; ArrayList updates = new ArrayList(); diff --git a/src/jd/controlling/LinkGrabberController.java b/src/jd/controlling/LinkGrabberController.java index 0c7529eb3c..3284d4d535 100644 --- a/src/jd/controlling/LinkGrabberController.java +++ b/src/jd/controlling/LinkGrabberController.java @@ -17,7 +17,7 @@ import jd.utils.JDUtilities; class LinkGrabberControllerBroadcaster extends JDBroadcaster { - @Override + //@Override protected void fireEvent(LinkGrabberControllerListener listener, LinkGrabberControllerEvent event) { listener.onLinkGrabberControllerEvent(event); } diff --git a/src/jd/controlling/LogFormatter.java b/src/jd/controlling/LogFormatter.java index fa488d5119..46f5740f12 100644 --- a/src/jd/controlling/LogFormatter.java +++ b/src/jd/controlling/LogFormatter.java @@ -45,7 +45,7 @@ public class LogFormatter extends SimpleFormatter { private StringBuilder sb; private StringBuffer text; - @Override + //@Override public synchronized String format(LogRecord record) { sb = new StringBuilder(); diff --git a/src/jd/controlling/ProgressController.java b/src/jd/controlling/ProgressController.java index 066bde1d79..b50aeab0a4 100644 --- a/src/jd/controlling/ProgressController.java +++ b/src/jd/controlling/ProgressController.java @@ -26,7 +26,7 @@ import jd.utils.JDUtilities; class ProgressControllerBroadcaster extends JDBroadcaster { - @Override + //@Override protected void fireEvent(ProgressControllerListener listener, ProgressControllerEvent event) { listener.handle_ProgressControllerEvent(event); @@ -108,7 +108,7 @@ public class ProgressController { setStatus(currentValue - 1); } - @Override + //@Override public void finalize() { if (finalizing) return; finished = true; @@ -209,7 +209,7 @@ public class ProgressController { fireChanges(); } - @Override + //@Override public String toString() { return "ProgressController " + id; } diff --git a/src/jd/controlling/SingleDownloadController.java b/src/jd/controlling/SingleDownloadController.java index e2c5c8efe1..64ea2fbd60 100644 --- a/src/jd/controlling/SingleDownloadController.java +++ b/src/jd/controlling/SingleDownloadController.java @@ -523,7 +523,7 @@ public class SingleDownloadController extends Thread { * * @see java.lang.Thread#run() */ - @Override + //@Override public void run() { /** diff --git a/src/jd/controlling/interaction/ExternExecute.java b/src/jd/controlling/interaction/ExternExecute.java index a7c40bc1cf..35096fa22b 100644 --- a/src/jd/controlling/interaction/ExternExecute.java +++ b/src/jd/controlling/interaction/ExternExecute.java @@ -41,7 +41,7 @@ public class ExternExecute extends Interaction implements Serializable, ActionLi doInteraction(null); } - @Override + //@Override public boolean doInteraction(Object arg) { if (getBooleanProperty(PROPERTY_DISABLED, false)) { logger.info("deaktiviert"); @@ -59,12 +59,12 @@ public class ExternExecute extends Interaction implements Serializable, ActionLi return true; } - @Override + //@Override public String getInteractionName() { return JDLocale.L("interaction.externExecute.name", "Extern Execute"); } - @Override + //@Override public void initConfig() { config.addEntry(new ConfigEntry(ConfigContainer.TYPE_BUTTON, this, JDLocale.L("interaction.externExecute.test", "Programm aufrufen"))); @@ -79,7 +79,7 @@ public class ExternExecute extends Interaction implements Serializable, ActionLi config.addEntry(new ConfigEntry(ConfigContainer.TYPE_SPINNER, this, PROPERTY_WAIT_FOR_RETURN, JDLocale.L("interaction.externExecute.waitForTermination", "Warten x Sekunden bis Befehl beendet ist [sek](-1 für unendlich)"), -1, 1800).setDefaultValue(0)); } - @Override + //@Override public String toString() { return JDLocale.L("interaction.externExecute.toString", "Externes Programm aufrufen"); } diff --git a/src/jd/controlling/interaction/Interaction.java b/src/jd/controlling/interaction/Interaction.java index bbbd9515b6..2f84ac3d15 100644 --- a/src/jd/controlling/interaction/Interaction.java +++ b/src/jd/controlling/interaction/Interaction.java @@ -240,7 +240,7 @@ public abstract class Interaction extends Property implements Serializable { this.trigger = trigger; } - @Override + //@Override public abstract String toString(); } diff --git a/src/jd/controlling/interaction/InteractionTrigger.java b/src/jd/controlling/interaction/InteractionTrigger.java index baae8f90b6..9351c3294e 100644 --- a/src/jd/controlling/interaction/InteractionTrigger.java +++ b/src/jd/controlling/interaction/InteractionTrigger.java @@ -97,7 +97,7 @@ public class InteractionTrigger implements Serializable { return description; } - @Override + //@Override public String toString() { return name + " (" + description + ")"; } diff --git a/src/jd/controlling/interaction/JDExit.java b/src/jd/controlling/interaction/JDExit.java index c8419cc490..263d665a2d 100644 --- a/src/jd/controlling/interaction/JDExit.java +++ b/src/jd/controlling/interaction/JDExit.java @@ -32,7 +32,7 @@ public class JDExit extends Interaction implements Serializable { private static final long serialVersionUID = -4825002404662625527L; - @Override + //@Override public boolean doInteraction(Object arg) { logger.info("Starting Exit"); CountdownConfirmDialog shutDownMessage = new CountdownConfirmDialog(((SimpleGUI) JDUtilities.getGUI()), "JD will close itself in 10 secs!", 10, true, CountdownConfirmDialog.STYLE_OK | CountdownConfirmDialog.STYLE_CANCEL); @@ -42,16 +42,16 @@ public class JDExit extends Interaction implements Serializable { return true; } - @Override + //@Override public String getInteractionName() { return JDLocale.L("interaction.jdexit.name", "JD Beenden"); } - @Override + //@Override public void initConfig() { } - @Override + //@Override public String toString() { return JDLocale.L("interaction.jdexit.name", "JD Beenden"); } diff --git a/src/jd/controlling/interaction/PackageManager.java b/src/jd/controlling/interaction/PackageManager.java index f9fb0c3bb9..98fc47a29e 100644 --- a/src/jd/controlling/interaction/PackageManager.java +++ b/src/jd/controlling/interaction/PackageManager.java @@ -77,7 +77,7 @@ public class PackageManager extends Interaction implements Serializable { } - @Override + //@Override public boolean doInteraction(Object arg) { checkNewInstalled(); @@ -149,7 +149,7 @@ public class PackageManager extends Interaction implements Serializable { } - @Override + //@Override public String getInteractionName() { return JDLocale.L("interaction.packagemanager.name", "Pakete aktualisieren"); } @@ -228,7 +228,7 @@ public class PackageManager extends Interaction implements Serializable { } - @Override + //@Override public void initConfig() { } @@ -263,7 +263,7 @@ public class PackageManager extends Interaction implements Serializable { WebUpdater.getConfig("JDU").save(); new Thread() { - @Override + //@Override public void run() { try { Thread.sleep(1000); @@ -308,7 +308,7 @@ public class PackageManager extends Interaction implements Serializable { } - @Override + //@Override public String toString() { return JDLocale.L("interaction.packagemanager.name", "Pakete aktualisieren"); } diff --git a/src/jd/controlling/interaction/ResetLink.java b/src/jd/controlling/interaction/ResetLink.java index 54173287ed..d40d54e4f7 100644 --- a/src/jd/controlling/interaction/ResetLink.java +++ b/src/jd/controlling/interaction/ResetLink.java @@ -34,7 +34,7 @@ public class ResetLink extends Interaction implements Serializable { private static final String PARAM_LAST_OR_ALL = "LAST_OR_ALL"; - @Override + //@Override public boolean doInteraction(Object arg) { logger.info("Starting Reset Link"); int type = this.getIntegerProperty(PARAM_LAST_OR_ALL, 1); @@ -58,17 +58,17 @@ public class ResetLink extends Interaction implements Serializable { return true; } - @Override + //@Override public String getInteractionName() { return JDLocale.L("interaction.resetLink.name", "Downloadlink zurücksetzen"); } - @Override + //@Override public void initConfig() { config.addEntry(new ConfigEntry(ConfigContainer.TYPE_COMBOBOX_INDEX, this, PARAM_LAST_OR_ALL, new String[] { JDLocale.L("interaction.resetLink.options.all", "all Links"), JDLocale.L("interaction.resetLink.options.lastLink", "only last Link") }, JDLocale.L("interaction.resetLink.whichLink", "Welcher Link soll zurückgesetzt werden?")).setDefaultValue(1)); } - @Override + //@Override public String toString() { return JDLocale.L("interaction.resetLink.name", "Downloadlink zurücksetzen"); } diff --git a/src/jd/controlling/interaction/SimpleExecute.java b/src/jd/controlling/interaction/SimpleExecute.java index 942928f599..370fe84291 100644 --- a/src/jd/controlling/interaction/SimpleExecute.java +++ b/src/jd/controlling/interaction/SimpleExecute.java @@ -44,7 +44,7 @@ public class SimpleExecute extends Interaction implements Serializable, ActionLi doInteraction(null); } - @Override + //@Override public boolean doInteraction(Object arg) { String command = Replacer.insertVariables(getStringProperty(PROPERTY_COMMAND)); String parameter = Replacer.insertVariables(getStringProperty(PROPERTY_PARAMETER)); @@ -68,12 +68,12 @@ public class SimpleExecute extends Interaction implements Serializable, ActionLi return true; } - @Override + //@Override public String getInteractionName() { return JDLocale.L("interaction.simpleExecute.name", "Programm/Script ausführen"); } - @Override + //@Override public void initConfig() { ConfigEntry cfg; ConfigEntry conditionEntry; @@ -96,7 +96,7 @@ public class SimpleExecute extends Interaction implements Serializable, ActionLi cfg.setEnabledCondidtion(conditionEntry, "==", true); } - @Override + //@Override public String toString() { return JDLocale.L("interaction.simpleExecute.name", "Programm/Script ausführen"); } diff --git a/src/jd/controlling/reconnect/BatchReconnect.java b/src/jd/controlling/reconnect/BatchReconnect.java index e55faeddf0..9cda397a68 100644 --- a/src/jd/controlling/reconnect/BatchReconnect.java +++ b/src/jd/controlling/reconnect/BatchReconnect.java @@ -43,7 +43,7 @@ public class BatchReconnect extends ReconnectMethod { configuration = SubConfiguration.getConfig("BATCHRECONNECT"); } - @Override + //@Override public void initConfig() { ConfigEntry cfg; config.addEntry(cfg = new ConfigEntry(ConfigContainer.TYPE_TEXTFIELD, configuration, PROPERTY_TERMINAL, JDLocale.L("interaction.batchreconnect.terminal", "Interpreter"))); @@ -60,7 +60,7 @@ public class BatchReconnect extends ReconnectMethod { } - @Override + //@Override protected boolean runCommands(ProgressController progress) { int waitForReturn = configuration.getIntegerProperty(PROPERTY_IP_WAIT_FOR_RETURN, -1); String executeIn = configuration.getStringProperty(PROPERTY_RECONNECT_EXECUTE_FOLDER); @@ -84,7 +84,7 @@ public class BatchReconnect extends ReconnectMethod { return true; } - @Override + //@Override public String toString() { return JDLocale.L("interaction.batchreconnect.toString", "Batch reconnect durchführen"); } diff --git a/src/jd/controlling/reconnect/ExternReconnect.java b/src/jd/controlling/reconnect/ExternReconnect.java index c68caec27f..f86b04c6ac 100644 --- a/src/jd/controlling/reconnect/ExternReconnect.java +++ b/src/jd/controlling/reconnect/ExternReconnect.java @@ -46,7 +46,7 @@ public class ExternReconnect extends ReconnectMethod { configuration = JDUtilities.getConfiguration(); } - @Override + //@Override public void initConfig() { config.addEntry(new ConfigEntry(ConfigContainer.TYPE_BROWSEFILE, configuration, PROPERTY_RECONNECT_COMMAND, JDLocale.L("interaction.externreconnect.command", "Befehl (absolute Pfade verwenden)"))); config.addEntry(new ConfigEntry(ConfigContainer.TYPE_TEXTAREA, configuration, PROPERTY_RECONNECT_PARAMETER, JDLocale.L("interaction.externreconnect.parameter", "Parameter (1 Parameter/Zeile)"))); @@ -54,7 +54,7 @@ public class ExternReconnect extends ReconnectMethod { config.addEntry(new ConfigEntry(ConfigContainer.TYPE_SPINNER, configuration, PROPERTY_IP_WAIT_FOR_RETURN, JDLocale.L("interaction.externreconnect.waitForTermination", "Warten x Sekunden bis Befehl beendet ist [sek]"), -1, 600).setDefaultValue(-1)); } - @Override + //@Override protected boolean runCommands(ProgressController progress) { int waitForReturn = configuration.getIntegerProperty(PROPERTY_IP_WAIT_FOR_RETURN, -1); String command = configuration.getStringProperty(PROPERTY_RECONNECT_COMMAND); @@ -70,7 +70,7 @@ public class ExternReconnect extends ReconnectMethod { return true; } - @Override + //@Override public String toString() { return JDLocale.L("interaction.externreconnect.toString", "Externes Reconnectprogramm aufrufen"); } diff --git a/src/jd/controlling/reconnect/HTTPLiveHeader.java b/src/jd/controlling/reconnect/HTTPLiveHeader.java index 3cb2273585..122c038581 100644 --- a/src/jd/controlling/reconnect/HTTPLiveHeader.java +++ b/src/jd/controlling/reconnect/HTTPLiveHeader.java @@ -69,7 +69,7 @@ public class HTTPLiveHeader extends ReconnectMethod { configuration = JDUtilities.getConfiguration(); } - @Override + //@Override protected boolean runCommands(ProgressController progress) { String script; if (configuration.getIntegerProperty(ReconnectMethod.PARAM_RECONNECT_TYPE, ReconnectMethod.LIVEHEADER) == ReconnectMethod.CLR) { @@ -508,11 +508,11 @@ public class HTTPLiveHeader extends ReconnectMethod { } - @Override + //@Override public void initConfig() { } - @Override + //@Override public String toString() { return JDLocale.L("interaction.liveHeader.name", "HTTP Live Header"); } diff --git a/src/jd/crypt/Base64.java b/src/jd/crypt/Base64.java index 8748839362..6eefeccb86 100644 --- a/src/jd/crypt/Base64.java +++ b/src/jd/crypt/Base64.java @@ -173,7 +173,7 @@ public class Base64 { * @return next byte * @since 1.3 */ - @Override + //@Override public int read() throws java.io.IOException { // Do we need to get data? if (position < 0) { @@ -287,7 +287,7 @@ public class Base64 { * @return bytes read into array or -1 if end of stream is encountered. * @since 1.3 */ - @Override + //@Override public int read(byte[] dest, int off, int len) throws java.io.IOException { int i; int b; @@ -389,7 +389,7 @@ public class Base64 { * * @since 1.3 */ - @Override + //@Override public void close() throws java.io.IOException { // 1. Ensure that pending characters are written flushBase64(); @@ -452,7 +452,7 @@ public class Base64 { * max number of bytes to read into array * @since 1.3 */ - @Override + //@Override public void write(byte[] theBytes, int off, int len) throws java.io.IOException { // Encoding suspended? if (suspendEncoding) { @@ -476,7 +476,7 @@ public class Base64 { * the byte to write * @since 1.3 */ - @Override + //@Override public void write(int theByte) throws java.io.IOException { // Encoding suspended? if (suspendEncoding) { diff --git a/src/jd/event/ControlEvent.java b/src/jd/event/ControlEvent.java index 9ecc5c9d16..34b3a28f79 100644 --- a/src/jd/event/ControlEvent.java +++ b/src/jd/event/ControlEvent.java @@ -153,7 +153,7 @@ public class ControlEvent extends AWTEvent { this.parameter = parameter; } - @Override + //@Override public int getID() { return controlID; } @@ -162,7 +162,7 @@ public class ControlEvent extends AWTEvent { return parameter; } - @Override + //@Override public String toString() { return "[source:" + source + ", controlID:" + controlID + ", parameter:" + parameter + "]"; } diff --git a/src/jd/gui/JDLookAndFeelManager.java b/src/jd/gui/JDLookAndFeelManager.java index 992b25ef65..178f89dd7a 100644 --- a/src/jd/gui/JDLookAndFeelManager.java +++ b/src/jd/gui/JDLookAndFeelManager.java @@ -30,6 +30,7 @@ import javax.swing.UIManager.LookAndFeelInfo; import jd.config.SubConfiguration; import jd.config.container.JDLabelContainer; +import jd.controlling.JDLogger; import jd.gui.skins.simple.SimpleGuiConstants; import jd.nutils.JDImage; import jd.nutils.OSDetector; @@ -173,22 +174,23 @@ public class JDLookAndFeelManager implements Serializable, JDLabelContainer { public static void setUIManager() { if (uiInitated) return; uiInitated = true; - String key = "os.name"; + installJGoodies(); if (JDUtilities.getJavaVersion() >= 1.6) installSubstance(); // installSynthetica(); - String value = System.getProperty(key); + // System.setProperty(key, "Windows XP"); /*dieser eintrag sorgt dafür // das JD unter linux nicht mehr startet*/ try { + JDLogger.getLogger().info("Use Look & Feel: "+getPlaf().getClassName()); UIManager.setLookAndFeel(getPlaf().getClassName()); } catch (Exception e) { jd.controlling.JDLogger.getLogger().log(java.util.logging.Level.SEVERE, "Exception occured", e); } - System.setProperty(key, value); + // try { // UIManager.setLookAndFeel( // "com.jgoodies.looks.windows.WindowsLookAndFeel"); @@ -279,7 +281,7 @@ public class JDLookAndFeelManager implements Serializable, JDLabelContainer { this.className = className; } - @Override + //@Override public boolean equals(Object obj) { return (obj instanceof JDLookAndFeelManager) && ((JDLookAndFeelManager) obj).getClassName() != null && ((JDLookAndFeelManager) obj).getClassName().equals(className); } @@ -292,7 +294,7 @@ public class JDLookAndFeelManager implements Serializable, JDLabelContainer { this.className = className; } - @Override + //@Override public String toString() { if (className == null) return null; if (staticName != null) return staticName; diff --git a/src/jd/gui/UserIO.java b/src/jd/gui/UserIO.java index 30927fa89e..29b99d706e 100644 --- a/src/jd/gui/UserIO.java +++ b/src/jd/gui/UserIO.java @@ -5,6 +5,8 @@ import java.io.File; import javax.swing.ImageIcon; public abstract class UserIO { + + /** * Flag to set that no Automatic captcha detection should be used in the * userinput @@ -17,6 +19,14 @@ public abstract class UserIO { public static final int NO_COUNTDOWN = 1<<2; public static final int NO_OK_OPTION = 1<<3; public static final int NO_CANCEL_OPTION = 1<<4; + public static final int DONT_SHOW_AGAIN = 1<<5; + /**Return IDS + * + */ + public static final int RETURN_OK = 1<<1; + public static final int RETURN_CANCEL = 1<<2; + public static final int RETURN_DONT_SHOW_AGAIN = 1<<3; + public static final int RETURN_SKIPPED_BY_DONT_SHOW = 1<<4; protected static UserIO INSTANCE = null; protected UserIO() { @@ -49,13 +59,13 @@ public abstract class UserIO { } - public boolean requestConfirmDialog(int flag, String title, String message, ImageIcon icon, String okOption, String cancelOption) { + public int requestConfirmDialog(int flag, String title, String message, ImageIcon icon, String okOption, String cancelOption) { synchronized (INSTANCE) { return showConfirmDialog(flag, title, message, icon, okOption,cancelOption); } } - abstract protected boolean showConfirmDialog(int flag, String title, String message, ImageIcon icon, String okOption, String cancelOption); + abstract protected int showConfirmDialog(int flag, String title, String message, ImageIcon icon, String okOption, String cancelOption); } diff --git a/src/jd/gui/skins/simple/AddonPane.java b/src/jd/gui/skins/simple/AddonPane.java index 05d90c90c9..6e6a985517 100644 --- a/src/jd/gui/skins/simple/AddonPane.java +++ b/src/jd/gui/skins/simple/AddonPane.java @@ -33,11 +33,11 @@ public class AddonPane extends JTabbedPanel implements ActionListener { public void actionPerformed(ActionEvent e) { } - @Override + //@Override public void onDisplay() { } - @Override + //@Override public void onHide() { } diff --git a/src/jd/gui/skins/simple/AgbDialog.java b/src/jd/gui/skins/simple/AgbDialog.java index da545bad9a..7a349ddfce 100644 --- a/src/jd/gui/skins/simple/AgbDialog.java +++ b/src/jd/gui/skins/simple/AgbDialog.java @@ -103,7 +103,7 @@ public class AgbDialog extends JDialog implements ActionListener { countdownThread = new Thread() { - @Override + //@Override public void run() { int c = countdown; diff --git a/src/jd/gui/skins/simple/ConvertDialog.java b/src/jd/gui/skins/simple/ConvertDialog.java index 9d73972843..0fa507cb50 100644 --- a/src/jd/gui/skins/simple/ConvertDialog.java +++ b/src/jd/gui/skins/simple/ConvertDialog.java @@ -52,7 +52,7 @@ public class ConvertDialog extends JFrame { this.ext = ext; } - @Override + //@Override public String toString() { return text; } @@ -132,7 +132,7 @@ public class ConvertDialog extends JFrame { if (displaymodes.size() == 1) // Bei einer einzigen Auswahl { return displaymodes.get(0); } // diese zurückgeben GuiRunnable run = new GuiRunnable() { - @Override + //@Override public ConversionMode runSave() { if (ConvertDialog.keepformat) { boolean newFormatChoosable = false; diff --git a/src/jd/gui/skins/simple/IconMenuBar.java b/src/jd/gui/skins/simple/IconMenuBar.java index ff3235308c..e165953510 100644 --- a/src/jd/gui/skins/simple/IconMenuBar.java +++ b/src/jd/gui/skins/simple/IconMenuBar.java @@ -26,7 +26,7 @@ public class IconMenuBar extends JMenuBar { this.setMinimumSize(new Dimension(width, height)); } - @Override + //@Override public void paint(Graphics g) { // super.paint(g); g.drawImage(appIcon, 0, 0, null); diff --git a/src/jd/gui/skins/simple/InputDialog.java b/src/jd/gui/skins/simple/InputDialog.java index 2fb2801b1f..dd00ff4c19 100644 --- a/src/jd/gui/skins/simple/InputDialog.java +++ b/src/jd/gui/skins/simple/InputDialog.java @@ -62,7 +62,7 @@ public class InputDialog extends JDialog implements ActionListener, KeyListener countdownThread = new Thread() { - @Override + //@Override public void run() { int c = countdown; while (!isVisible()) { diff --git a/src/jd/gui/skins/simple/JDAboutDialog.java b/src/jd/gui/skins/simple/JDAboutDialog.java index 1b53b4c9d1..74b4449877 100644 --- a/src/jd/gui/skins/simple/JDAboutDialog.java +++ b/src/jd/gui/skins/simple/JDAboutDialog.java @@ -123,7 +123,7 @@ public class JDAboutDialog extends JDialog { private void getPage(final JTextPane textPane) { new Thread() { - @Override + //@Override public void run() { try { Browser br = new Browser(); diff --git a/src/jd/gui/skins/simple/JDCollapser.java b/src/jd/gui/skins/simple/JDCollapser.java index bf5a834bb1..c041f8444d 100644 --- a/src/jd/gui/skins/simple/JDCollapser.java +++ b/src/jd/gui/skins/simple/JDCollapser.java @@ -36,7 +36,7 @@ public class JDCollapser extends JXTaskPane implements MouseListener { this.setAnimated(SimpleGuiConstants.isAnimated()); JDController.getInstance().addControlListener(new ConfigPropertyListener(SimpleGuiConstants.ANIMATION_ENABLED) { - @Override + //@Override public void onPropertyChanged(Property source, String propertyName) { setAnimated(SimpleGuiConstants.isAnimated()); diff --git a/src/jd/gui/skins/simple/JDEventQueue.java b/src/jd/gui/skins/simple/JDEventQueue.java index 839b5802fe..1540258674 100644 --- a/src/jd/gui/skins/simple/JDEventQueue.java +++ b/src/jd/gui/skins/simple/JDEventQueue.java @@ -59,13 +59,13 @@ public class JDEventQueue extends EventQueue { } - @Override + //@Override public boolean isEnabled() { return c.isEditable() && c.isEnabled() && c.getSelectedText() != null; } } - @Override + //@Override protected void dispatchEvent(AWTEvent ev) { super.dispatchEvent(ev); if (!(ev instanceof MouseEvent)) { return; } @@ -94,7 +94,7 @@ public class JDEventQueue extends EventQueue { c.copy(); } - @Override + //@Override public boolean isEnabled() { return c.isEnabled() && c.getSelectedText() != null; } @@ -107,7 +107,7 @@ public class JDEventQueue extends EventQueue { c.paste(); } - @Override + //@Override public boolean isEnabled() { if (c.isEditable() && c.isEnabled()) { Transferable contents = Toolkit.getDefaultToolkit().getSystemClipboard().getContents(this); @@ -134,7 +134,7 @@ public class JDEventQueue extends EventQueue { c.selectAll(); } - @Override + //@Override public boolean isEnabled() { return c.isEnabled() && c.getText().length() > 0; } diff --git a/src/jd/gui/skins/simple/JDMenuAction.java b/src/jd/gui/skins/simple/JDMenuAction.java index e32421cccb..99c6ca9a50 100644 --- a/src/jd/gui/skins/simple/JDMenuAction.java +++ b/src/jd/gui/skins/simple/JDMenuAction.java @@ -55,7 +55,7 @@ public class JDMenuAction extends AbstractAction { return menuItem.getActionID(); } - @Override + //@Override public boolean isEnabled() { return menuItem.isEnabled(); } diff --git a/src/jd/gui/skins/simple/JDSubstanceTitlePane.java b/src/jd/gui/skins/simple/JDSubstanceTitlePane.java index fd2d53b51e..411b528970 100644 --- a/src/jd/gui/skins/simple/JDSubstanceTitlePane.java +++ b/src/jd/gui/skins/simple/JDSubstanceTitlePane.java @@ -1,22 +1,42 @@ package jd.gui.skins.simple; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Frame; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Rectangle; +import java.awt.Window; + import javax.swing.JMenuBar; import javax.swing.JRootPane; import jd.gui.skins.simple.startmenu.JDStartMenu; +import org.jvnet.lafwidget.animation.effects.GhostPaintingUtils; +import org.jvnet.substance.SubstanceLookAndFeel; import org.jvnet.substance.SubstanceRootPaneUI; +import org.jvnet.substance.api.SubstanceColorScheme; +import org.jvnet.substance.api.SubstanceSkin; +import org.jvnet.substance.painter.decoration.DecorationAreaType; +import org.jvnet.substance.utils.SubstanceColorUtilities; +import org.jvnet.substance.utils.SubstanceCoreUtilities; +import org.jvnet.substance.utils.SubstanceTextUtilities; import org.jvnet.substance.utils.SubstanceTitlePane; public class JDSubstanceTitlePane extends SubstanceTitlePane { private static final long serialVersionUID = -2571143182567635859L; + private SubstanceColorScheme scheme; public JDSubstanceTitlePane(JRootPane root, SubstanceRootPaneUI ui) { super(root, ui); + final JRootPane rootPane = this.getRootPane(); + SubstanceSkin skin = SubstanceCoreUtilities.getSkin(rootPane); + scheme = skin.getMainDefaultColorScheme(DecorationAreaType.PRIMARY_TITLE_PANE); } - @Override + //@Override protected JMenuBar createMenuBar() { JMenuBar ret = super.createMenuBar(); @@ -30,4 +50,62 @@ public class JDSubstanceTitlePane extends SubstanceTitlePane { JDStartMenu.createMenu(menuBar.getMenu(0)); } + private Window getWindow() { + return this.window; + } + + public Frame getFrame() { + Window window = this.getWindow(); + + if (window instanceof Frame) { return (Frame) window; } + return null; + } + + public void paintComponent(Graphics g) { + Window w = this.getWindow(); + String theTitle = null; + if (w instanceof Frame) { + theTitle = ((Frame) w).getTitle(); + ((Frame) w).setTitle(null); + super.paintComponent(g); + ((Frame) w).setTitle(theTitle); + int xOffset = 0; + int width = this.getWidth(); + int height = this.getHeight(); + JRootPane rootPane = this.getRootPane(); + if (theTitle != null) { + Rectangle titleTextRect = this.getTitleTextRectangle(); + FontMetrics fm = rootPane.getFontMetrics(g.getFont()); + + + + xOffset = width/2-fm.stringWidth(theTitle)/2; + } + + Graphics2D graphics = (Graphics2D) g.create(); + Font font = SubstanceLookAndFeel.getFontPolicy().getFontSet("Substance", null).getWindowTitleFont(); + graphics.setFont(font); + + // draw the title (if needed) + if (theTitle != null) { + FontMetrics fm = rootPane.getFontMetrics(graphics.getFont()); + int yOffset = ((height - fm.getHeight()) / 2) + fm.getAscent(); + + SubstanceTextUtilities.paintTextWithDropShadow(this, graphics, SubstanceColorUtilities.getForegroundColor(scheme), theTitle, width, height, xOffset, yOffset); + } + + GhostPaintingUtils.paintGhostImages(this, graphics); + + // long end = System.nanoTime(); + // System.out.println(end - start); + graphics.dispose(); + + return; + } else { + super.paintComponent(g); + return; + } + + } + } diff --git a/src/jd/gui/skins/simple/JDToolBar.java b/src/jd/gui/skins/simple/JDToolBar.java index 07457d53dd..0d8b1f456b 100644 --- a/src/jd/gui/skins/simple/JDToolBar.java +++ b/src/jd/gui/skins/simple/JDToolBar.java @@ -47,7 +47,7 @@ public class JDToolBar extends JToolBar implements ControlListener { JDUtilities.getController().addControlListener(this); this.setFloatable(false); this.setLayout(new MigLayout(" ins 0", "[][][][][][][][][][][][][][grow,fill]")); - if (noTitlePane) { + if (noTitlePane||true) { IconMenuBar mb = new IconMenuBar(); JMenu menu = new JMenu(""); @@ -232,7 +232,7 @@ public class JDToolBar extends JToolBar implements ControlListener { public void controlEvent(final ControlEvent event) { new GuiRunnable() { - @Override + //@Override public Object runSave() { switch (event.getID()) { case ControlEvent.CONTROL_DOWNLOAD_START: diff --git a/src/jd/gui/skins/simple/LogPane.java b/src/jd/gui/skins/simple/LogPane.java index 8ea7a1bb26..a639348f82 100644 --- a/src/jd/gui/skins/simple/LogPane.java +++ b/src/jd/gui/skins/simple/LogPane.java @@ -161,7 +161,7 @@ public class LogPane extends JTabbedPanel implements ActionListener, ControlList } - @Override + //@Override public String toString() { String content = logField.getSelectedText(); if (content == null || content.length() == 0) { @@ -170,7 +170,7 @@ public class LogPane extends JTabbedPanel implements ActionListener, ControlList return content; } - @Override + //@Override public void onDisplay() { /* * enable autoscrolling by setting the caret to the last position @@ -188,7 +188,7 @@ public class LogPane extends JTabbedPanel implements ActionListener, ControlList logField.setCaretPosition(logField.getText().length()); } - @Override + //@Override public void onHide() { JDUtilities.getController().removeControlListener(this); } diff --git a/src/jd/gui/skins/simple/PremiumStatus.java b/src/jd/gui/skins/simple/PremiumStatus.java index 5bb2139333..d8418016d0 100644 --- a/src/jd/gui/skins/simple/PremiumStatus.java +++ b/src/jd/gui/skins/simple/PremiumStatus.java @@ -297,7 +297,7 @@ public class PremiumStatus extends JPanel implements ControlListener, AccountLis if (redrawinprogress) return; redrawinprogress = true; new GuiRunnable() { - @Override + //@Override public Object runSave() { synchronized (Lock) { try { diff --git a/src/jd/gui/skins/simple/SimpleGUI.java b/src/jd/gui/skins/simple/SimpleGUI.java index e829b31c97..d7742bc669 100644 --- a/src/jd/gui/skins/simple/SimpleGUI.java +++ b/src/jd/gui/skins/simple/SimpleGUI.java @@ -193,7 +193,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W JDController.getInstance().addControlListener(new ConfigPropertyListener(SimpleGuiConstants.ANIMATION_ENABLED) { - @Override + //@Override public void onPropertyChanged(Property source, String propertyName) { } @@ -213,7 +213,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W this.setAnimate(); JDController.getInstance().addControlListener(new ConfigPropertyListener(SimpleGuiConstants.ANIMATION_ENABLED) { - @Override + //@Override public void onPropertyChanged(Property source, String propertyName) { setAnimate(); } @@ -403,7 +403,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W // break; // // case JDAction.APP_RECONNECT: // // new Thread() { - // // @Override + // // //@Override // // public void run() { // // doReconnect(); // // } @@ -512,7 +512,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W public synchronized void addLinksToGrabber(final Vector links, final boolean hideGrabber) { new GuiRunnable() { - @Override + //@Override public Object runSave() { logger.info("Add links to Linkgrabber: " + links.size()); DownloadLink[] linkList = links.toArray(new DownloadLink[] {}); @@ -1001,7 +1001,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W GuiRunnable run = new GuiRunnable() { - @Override + //@Override public Boolean runSave() { Object[] options = { JDLocale.L("gui.btn_yes", "Yes"), JDLocale.L("gui.btn_no", "No") }; int n = JOptionPane.showOptionDialog(SimpleGUI.this, message, title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[0]); @@ -1015,7 +1015,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W public boolean showCountdownConfirmDialog(final String string, final int sec) { return new GuiRunnable() { - @Override + //@Override public Boolean runSave() { return CountdownConfirmDialog.showCountdownConfirmDialog(SimpleGUI.this, string, sec); @@ -1030,7 +1030,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W final String msg = toHTML ? "" + message + "" : message; return new GuiRunnable() { - @Override + //@Override public Integer runSave() { try { return JHelpDialog.showHelpMessage(SimpleGUI.this, title, msg, new URL(url), helpMsg, sec); @@ -1047,7 +1047,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W public boolean showHTMLDialog(final String title, final String htmlQuestion) { return new GuiRunnable() { - @Override + //@Override public Boolean runSave() { return HTMLDialog.showDialog(SimpleGUI.this, title, htmlQuestion); @@ -1063,7 +1063,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W new GuiRunnable() { - @Override + //@Override public Object runSave() { JOptionPane.showMessageDialog(SimpleGUI.this, string); @@ -1077,7 +1077,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W public String showTextAreaDialog(final String title, final String question, final String def) { GuiRunnable run = new GuiRunnable() { - @Override + //@Override public String runSave() { return TextAreaDialog.showDialog(SimpleGUI.this, title, question, def); } @@ -1093,7 +1093,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W public String showUserInputDialog(final String string, final String def) { GuiRunnable run = new GuiRunnable() { - @Override + //@Override public String runSave() { return JOptionPane.showInputDialog(SimpleGUI.this, string, def); } @@ -1105,7 +1105,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W public String[] showTextAreaDialog(final String title, final String questionOne, final String questionTwo, final String defaultOne, final String defaultTwo) { GuiRunnable run = new GuiRunnable() { - @Override + //@Override public String[] runSave() { return TextAreaDialog.showDialog(SimpleGUI.this, title, questionOne, questionTwo, defaultOne, defaultTwo); } @@ -1117,7 +1117,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W public String[] showTwoTextFieldDialog(final String title, final String questionOne, final String questionTwo, final String defaultOne, final String defaultTwo) { GuiRunnable run = new GuiRunnable() { - @Override + //@Override public String[] runSave() { return TwoTextFieldDialog.showDialog(SimpleGUI.this, title, questionOne, questionTwo, defaultOne, defaultTwo); } @@ -1129,7 +1129,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W public static void displayConfig(final ConfigContainer container, final int i) { new GuiRunnable() { - @Override + //@Override public Object runSave() { ConfigEntriesPanel cep; JDCollapser.getInstance().setContentPanel(cep = new ConfigEntriesPanel(container)); @@ -1199,7 +1199,7 @@ public class SimpleGUI extends JXFrame implements UIInterface, ActionListener, W public void showAccountInformation(final PluginForHost pluginForHost, final Account account) { new GuiRunnable() { - @Override + //@Override public Object runSave() { AccountInfo ai; try { diff --git a/src/jd/gui/skins/simple/components/BrowseFile.java b/src/jd/gui/skins/simple/components/BrowseFile.java index 795f6271ad..206792fd22 100644 --- a/src/jd/gui/skins/simple/components/BrowseFile.java +++ b/src/jd/gui/skins/simple/components/BrowseFile.java @@ -182,7 +182,7 @@ public class BrowseFile extends JPanel implements ActionListener { editable = value; } - @Override + //@Override public void setEnabled(boolean value) { txtInput.setEnabled(value); btnBrowse.setEnabled(value); diff --git a/src/jd/gui/skins/simple/components/ChartAPI.java b/src/jd/gui/skins/simple/components/ChartAPI.java index 740b7b638b..214a8c9995 100644 --- a/src/jd/gui/skins/simple/components/ChartAPI.java +++ b/src/jd/gui/skins/simple/components/ChartAPI.java @@ -53,7 +53,7 @@ public abstract class ChartAPI extends JComponent { this.path = path; } - @Override + //@Override public void run() { BufferedImage image = null; try { @@ -174,7 +174,7 @@ public abstract class ChartAPI extends JComponent { this.transparentRGB = color.getRGB(); } - @Override + //@Override public int filterRGB(int x, int y, int rgb) { if (Colors.getColorDifference(rgb, transparentRGB) > 40.0) return rgb | 0x44000000; diff --git a/src/jd/gui/skins/simple/components/ClickPositionDialog.java b/src/jd/gui/skins/simple/components/ClickPositionDialog.java index 7a900861ac..9be8cb2888 100644 --- a/src/jd/gui/skins/simple/components/ClickPositionDialog.java +++ b/src/jd/gui/skins/simple/components/ClickPositionDialog.java @@ -80,7 +80,7 @@ public class ClickPositionDialog extends JDialog implements ActionListener, Hype countdownThread = new Thread() { - @Override + //@Override public void run() { while (!isVisible() && isDisplayable()) { diff --git a/src/jd/gui/skins/simple/components/ComboBrowseFile.java b/src/jd/gui/skins/simple/components/ComboBrowseFile.java index 82f907494d..f881290748 100644 --- a/src/jd/gui/skins/simple/components/ComboBrowseFile.java +++ b/src/jd/gui/skins/simple/components/ComboBrowseFile.java @@ -270,7 +270,7 @@ public class ComboBrowseFile extends JPanel implements ActionListener { editable = value; } - @Override + //@Override public void setEnabled(boolean value) { cmboInput.setEnabled(value); btnBrowse.setEnabled(value); diff --git a/src/jd/gui/skins/simple/components/CountdownConfirmDialog.java b/src/jd/gui/skins/simple/components/CountdownConfirmDialog.java index 5409906db0..6634b6e547 100644 --- a/src/jd/gui/skins/simple/components/CountdownConfirmDialog.java +++ b/src/jd/gui/skins/simple/components/CountdownConfirmDialog.java @@ -137,7 +137,7 @@ public class CountdownConfirmDialog extends JDialog implements ActionListener, H countdownThread = new Thread() { - @Override + //@Override public void run() { while (!isVisible() && isDisplayable()) { diff --git a/src/jd/gui/skins/simple/components/DownloadView/DownloadLinksPanel.java b/src/jd/gui/skins/simple/components/DownloadView/DownloadLinksPanel.java index d7a1b8e096..e27587b37b 100644 --- a/src/jd/gui/skins/simple/components/DownloadView/DownloadLinksPanel.java +++ b/src/jd/gui/skins/simple/components/DownloadView/DownloadLinksPanel.java @@ -104,7 +104,7 @@ public class DownloadLinksPanel extends JTabbedPanel implements ActionListener, } } - @Override + //@Override public void onDisplay() { visible = true; updateTableTask(REFRESH_DATA_AND_STRUCTURE_CHANGED, null); @@ -115,7 +115,7 @@ public class DownloadLinksPanel extends JTabbedPanel implements ActionListener, internalTreeTable.addKeyListener(internalTreeTable); } - @Override + //@Override public void onHide() { visible = false; JDUtilities.getDownloadController().getBroadcaster().removeListener(this); diff --git a/src/jd/gui/skins/simple/components/DownloadView/DownloadTreeTable.java b/src/jd/gui/skins/simple/components/DownloadView/DownloadTreeTable.java index 8c662ea872..360f1c3098 100644 --- a/src/jd/gui/skins/simple/components/DownloadView/DownloadTreeTable.java +++ b/src/jd/gui/skins/simple/components/DownloadView/DownloadTreeTable.java @@ -146,7 +146,7 @@ public class DownloadTreeTable extends JXTreeTable implements TreeExpansionListe // addHighlighter(new FilepackageRowHighlighter(this, Color.RED, // Color.BLUE, Color.RED, Color.BLUE) { - // @Override + // //@Override // public boolean doHighlight(FilePackage fp) { // return true; // } @@ -154,7 +154,7 @@ public class DownloadTreeTable extends JXTreeTable implements TreeExpansionListe addHighlighter(new PainterHighlighter(HighlightPredicate.IS_FOLDER, getFolderPainter(this))); // Highlighter extendPrefWidth = new AbstractHighlighter() { - // @Override + // //@Override // protected Component doHighlight(Component component, ComponentAdapter // adapter) { // Dimension dim = component.getPreferredSize(); @@ -210,7 +210,7 @@ public class DownloadTreeTable extends JXTreeTable implements TreeExpansionListe Color background = JDTheme.C("gui.color.downloadlist.error_post", "ff9936", 100); addHighlighter(new DownloadLinkRowHighlighter(this, background, background) { - @Override + //@Override public boolean doHighlight(DownloadLink dLink) { return dLink.getLinkStatus().getRemainingWaittime() > 0 || dLink.getPlugin() == null || dLink.getPlugin().getRemainingHosterWaittime() > 0; } @@ -222,7 +222,7 @@ public class DownloadTreeTable extends JXTreeTable implements TreeExpansionListe Color background = JDTheme.C("gui.color.downloadlist.error_post", "ff9936", 120); addHighlighter(new DownloadLinkRowHighlighter(this, background, background) { - @Override + //@Override public boolean doHighlight(DownloadLink link) { return link.getLinkStatus().hasStatus(LinkStatus.ERROR_POST_PROCESS); } @@ -234,7 +234,7 @@ public class DownloadTreeTable extends JXTreeTable implements TreeExpansionListe Color background = JDTheme.C("gui.color.downloadlist.row_link_disabled", "adadad", 100); addHighlighter(new DownloadLinkRowHighlighter(this, background, background) { - @Override + //@Override public boolean doHighlight(DownloadLink link) { return !link.isEnabled(); } diff --git a/src/jd/gui/skins/simple/components/DownloadView/DownloadTreeTableModel.java b/src/jd/gui/skins/simple/components/DownloadView/DownloadTreeTableModel.java index d80470046a..ec4dcf2ca0 100644 --- a/src/jd/gui/skins/simple/components/DownloadView/DownloadTreeTableModel.java +++ b/src/jd/gui/skins/simple/components/DownloadView/DownloadTreeTableModel.java @@ -101,7 +101,7 @@ public class DownloadTreeTableModel extends AbstractTreeTableModel { return count; } - @Override + //@Override public Class getColumnClass(int column) { switch (column) { case COL_HIDDEN: @@ -128,7 +128,7 @@ public class DownloadTreeTableModel extends AbstractTreeTableModel { return COLUMN_NAMES.length; } - @Override + //@Override public String getColumnName(int column) { return COLUMN_NAMES[column]; } @@ -188,13 +188,13 @@ public class DownloadTreeTableModel extends AbstractTreeTableModel { return null; } - @Override + //@Override public boolean isCellEditable(Object node, int column) { return true; } - @Override + //@Override public void setValueAt(Object value, Object node, int col) { JDLogger.getLogger().info("NNNN"); } diff --git a/src/jd/gui/skins/simple/components/DownloadView/TreeTableRenderer.java b/src/jd/gui/skins/simple/components/DownloadView/TreeTableRenderer.java index 7f2e337c15..2524662289 100644 --- a/src/jd/gui/skins/simple/components/DownloadView/TreeTableRenderer.java +++ b/src/jd/gui/skins/simple/components/DownloadView/TreeTableRenderer.java @@ -110,7 +110,7 @@ public class TreeTableRenderer extends DefaultTableRenderer { strWaitIO = JDLocale.L("gui.linkgrabber.waitinguserio", "Waiting for user input"); } - @Override + //@Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { hasFocus = false; column = this.table.getColumn(column).getModelIndex(); diff --git a/src/jd/gui/skins/simple/components/DownloadView/TreeTableTransferHandler.java b/src/jd/gui/skins/simple/components/DownloadView/TreeTableTransferHandler.java index 6a23898061..0a772a5afc 100644 --- a/src/jd/gui/skins/simple/components/DownloadView/TreeTableTransferHandler.java +++ b/src/jd/gui/skins/simple/components/DownloadView/TreeTableTransferHandler.java @@ -57,7 +57,7 @@ public class TreeTableTransferHandler extends TransferHandler { } @SuppressWarnings("unchecked") - @Override + //@Override public boolean canImport(TreeTableTransferHandler.TransferSupport info) { if (isDragging) { if (draggingObjects == null) return false; @@ -85,7 +85,7 @@ public class TreeTableTransferHandler extends TransferHandler { } } - @Override + //@Override protected Transferable createTransferable(JComponent c) { isDragging = true; Vector packages = treeTable.getSelectedFilePackages(); @@ -102,7 +102,7 @@ public class TreeTableTransferHandler extends TransferHandler { return new StringSelection("JDAFFE"); } - @Override + //@Override protected void exportDone(JComponent source, Transferable data, int action) { isDragging = false; } @@ -211,13 +211,13 @@ public class TreeTableTransferHandler extends TransferHandler { return true; } - @Override + //@Override public int getSourceActions(JComponent c) { return MOVE; } @SuppressWarnings("unchecked") - @Override + //@Override public boolean importData(TreeTableTransferHandler.TransferSupport info) { try { Transferable tr = info.getTransferable(); diff --git a/src/jd/gui/skins/simple/components/DragNDrop.java b/src/jd/gui/skins/simple/components/DragNDrop.java index aeaba2513b..26eb770cac 100644 --- a/src/jd/gui/skins/simple/components/DragNDrop.java +++ b/src/jd/gui/skins/simple/components/DragNDrop.java @@ -102,7 +102,7 @@ public class DragNDrop extends JComponent implements DropTargetListener { * @param g * Graphicobjekt */ - @Override + //@Override public void paintComponent(Graphics g) { g.drawImage(image, 0, 0, null); } diff --git a/src/jd/gui/skins/simple/components/JDFileChooser.java b/src/jd/gui/skins/simple/components/JDFileChooser.java index 58606dc87d..dd5659cde9 100644 --- a/src/jd/gui/skins/simple/components/JDFileChooser.java +++ b/src/jd/gui/skins/simple/components/JDFileChooser.java @@ -60,7 +60,7 @@ public class JDFileChooser extends JFileChooser { return super.createDialog(parent); } - @Override + //@Override public File getSelectedFile() { File ret = super.getSelectedFile(); @@ -73,7 +73,7 @@ public class JDFileChooser extends JFileChooser { return ret; } - @Override + //@Override public File[] getSelectedFiles() { File[] ret = super.getSelectedFiles(); diff --git a/src/jd/gui/skins/simple/components/JDUnderlinedText.java b/src/jd/gui/skins/simple/components/JDUnderlinedText.java index b35c119ec4..af677afeab 100644 --- a/src/jd/gui/skins/simple/components/JDUnderlinedText.java +++ b/src/jd/gui/skins/simple/components/JDUnderlinedText.java @@ -13,7 +13,7 @@ public class JDUnderlinedText extends MouseAdapter { private Font originalFont; @SuppressWarnings("unchecked") - @Override + //@Override public void mouseEntered(MouseEvent evt) { if (!(evt.getSource() instanceof JComponent)) return; JComponent src = (JComponent) evt.getSource(); @@ -27,7 +27,7 @@ public class JDUnderlinedText extends MouseAdapter { } - @Override + //@Override public void mouseExited(MouseEvent evt) { if (!(evt.getSource() instanceof JComponent)) return; JComponent src = (JComponent) evt.getSource(); diff --git a/src/jd/gui/skins/simple/components/JHelpDialog.java b/src/jd/gui/skins/simple/components/JHelpDialog.java index 5a43730144..d711716981 100644 --- a/src/jd/gui/skins/simple/components/JHelpDialog.java +++ b/src/jd/gui/skins/simple/components/JHelpDialog.java @@ -73,7 +73,7 @@ public class JHelpDialog extends JDialog implements ActionListener { d.getBtn1().setText(helpMsg); d.getBtn2().setText(JDLocale.L("gui.btn_ok", "OK")); d.action1 = d.new Action() { - @Override + //@Override public boolean doAction() { try { JLinkButton.openURL(url); @@ -148,7 +148,7 @@ public class JHelpDialog extends JDialog implements ActionListener { countdownThread = new Thread() { - @Override + //@Override public void run() { int c = countdown; diff --git a/src/jd/gui/skins/simple/components/JLinkButton.java b/src/jd/gui/skins/simple/components/JLinkButton.java index 606f5f137f..33bacc8069 100644 --- a/src/jd/gui/skins/simple/components/JLinkButton.java +++ b/src/jd/gui/skins/simple/components/JLinkButton.java @@ -65,7 +65,7 @@ class BasicLinkButtonUI extends MetalButtonUI { public BasicLinkButtonUI() { } - @Override + //@Override protected void paintText(Graphics g, JComponent com, Rectangle rect, String s) { JLinkButton bn = (JLinkButton) com; ButtonModel bnModel = bn.getModel(); @@ -433,7 +433,7 @@ public class JLinkButton extends JButton { * private void setDefault() { UIManager.getDefaults().put("LinkButtonUI", * "BasicLinkButtonUI"); } */ - @Override + //@Override public String getUIClassID() { return "LinkButtonUI"; } @@ -462,7 +462,7 @@ public class JLinkButton extends JButton { return isLinkVisited; } - @Override + //@Override protected String paramString() { String str; if (linkBehavior == ALWAYS_UNDERLINE) { @@ -551,7 +551,7 @@ public class JLinkButton extends JButton { repaint(); } - @Override + //@Override public void updateUI() { setUI(BasicLinkButtonUI.createUI(this)); } diff --git a/src/jd/gui/skins/simple/components/Linkgrabber/LinkAdder.java b/src/jd/gui/skins/simple/components/Linkgrabber/LinkAdder.java index 856a038dd1..839143cf74 100644 --- a/src/jd/gui/skins/simple/components/Linkgrabber/LinkAdder.java +++ b/src/jd/gui/skins/simple/components/Linkgrabber/LinkAdder.java @@ -89,7 +89,7 @@ public class LinkAdder extends JTabbedPanel { } - @Override + //@Override public void onDisplay() { this.mainClipBoardEnabled = ClipboardHandler.getClipboard().isEnabled(); ClipboardHandler.getClipboard().setEnabled(false); @@ -142,7 +142,7 @@ public class LinkAdder extends JTabbedPanel { if (text.getText().contains(newText)) return; new GuiRunnable() { - @Override + //@Override public Object runSave() { text.setText(text.getText() + "\r\n" + newText); return null; @@ -151,7 +151,7 @@ public class LinkAdder extends JTabbedPanel { } - @Override + //@Override public void onHide() { setClipboard(false); ClipboardHandler.getClipboard().setEnabled(mainClipBoardEnabled); diff --git a/src/jd/gui/skins/simple/components/Linkgrabber/LinkCheck.java b/src/jd/gui/skins/simple/components/Linkgrabber/LinkCheck.java index 6f8e896958..72019d894e 100644 --- a/src/jd/gui/skins/simple/components/Linkgrabber/LinkCheck.java +++ b/src/jd/gui/skins/simple/components/Linkgrabber/LinkCheck.java @@ -21,7 +21,7 @@ import jd.utils.JDLocale; class LinkCheckBroadcaster extends JDBroadcaster { - @Override + //@Override protected void fireEvent(LinkCheckListener listener, LinkCheckEvent event) { listener.handle_LinkCheckEvent(event); } diff --git a/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberFilePackage.java b/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberFilePackage.java index 65ffc25f3c..6c37fa9515 100644 --- a/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberFilePackage.java +++ b/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberFilePackage.java @@ -19,7 +19,7 @@ import jd.utils.JDUtilities; class LinkGrabberFilePackageBroadcaster extends JDBroadcaster { - @Override + //@Override protected void fireEvent(LinkGrabberFilePackageListener listener, LinkGrabberFilePackageEvent event) { listener.handle_LinkGrabberFilePackageEvent(event); } diff --git a/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberFilePackageInfo.java b/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberFilePackageInfo.java index cbf35a77dd..047e9d4578 100644 --- a/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberFilePackageInfo.java +++ b/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberFilePackageInfo.java @@ -164,13 +164,13 @@ public class LinkGrabberFilePackageInfo extends JTabbedPanel implements ActionL } } - @Override + //@Override public void onDisplay() { // TODO Auto-generated method stub } - @Override + //@Override public void onHide() { if (this.fp == null) return; fp = null; diff --git a/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberPanel.java b/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberPanel.java index 51e50523b4..f530292308 100644 --- a/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberPanel.java +++ b/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberPanel.java @@ -127,7 +127,7 @@ public class LinkGrabberPanel extends JTabbedPanel implements ActionListener, Li } } - @Override + //@Override public void onHide() { LGINSTANCE.getBroadcaster().removeListener(this); Update_Async.stop(); @@ -211,7 +211,7 @@ public class LinkGrabberPanel extends JTabbedPanel implements ActionListener, Li Update_Async.restart(); } - @Override + //@Override public void onDisplay() { fireTableChanged(1, null); LGINSTANCE.getBroadcaster().addListener(this); diff --git a/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTable.java b/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTable.java index 73dbdecad2..cece1a3061 100644 --- a/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTable.java +++ b/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTable.java @@ -381,7 +381,7 @@ public class LinkGrabberTreeTable extends JXTreeTable implements MouseListener, Color background = JDTheme.C("gui.color.downloadlist.row_link_disabled", "adadad", 100); addHighlighter(new DownloadLinkRowHighlighter(this, background, background) { - @Override + //@Override public boolean doHighlight(DownloadLink link) { return !link.isEnabled(); } @@ -413,7 +413,7 @@ public class LinkGrabberTreeTable extends JXTreeTable implements MouseListener, Color background = JDTheme.C("gui.color.linkgrabber.error_exists", "ff7f00", 120); addHighlighter(new DownloadLinkRowHighlighter(this, background, background) { - @Override + //@Override public boolean doHighlight(DownloadLink link) { if (link.getLinkStatus().hasStatus(LinkStatus.ERROR_ALREADYEXISTS)) return true; return false; diff --git a/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTableModel.java b/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTableModel.java index b7aeef4f67..866173e9f3 100644 --- a/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTableModel.java +++ b/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTableModel.java @@ -76,7 +76,7 @@ public class LinkGrabberTreeTableModel extends AbstractTreeTableModel { return count; } - @Override + //@Override public Class getColumnClass(int column) { switch (column) { case COL_HIDDEN: @@ -100,7 +100,7 @@ public class LinkGrabberTreeTableModel extends AbstractTreeTableModel { return COLUMN_NAMES.length; } - @Override + //@Override public String getColumnName(int column) { return COLUMN_NAMES[column]; } @@ -183,7 +183,7 @@ public class LinkGrabberTreeTableModel extends AbstractTreeTableModel { return null; } - @Override + //@Override public boolean isCellEditable(Object node, int column) { return true; } diff --git a/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTableRenderer.java b/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTableRenderer.java index aa7309a676..c8f763101c 100644 --- a/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTableRenderer.java +++ b/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTableRenderer.java @@ -67,7 +67,7 @@ public class LinkGrabberTreeTableRenderer extends DefaultTableRenderer { imgFailed = JDTheme.II("gui.images.bad", 16, 16); } - @Override + //@Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { hasFocus = false; column = this.table.getColumn(column).getModelIndex(); diff --git a/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTableTransferHandler.java b/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTableTransferHandler.java index 7405e5c3d4..e0e40035d6 100644 --- a/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTableTransferHandler.java +++ b/src/jd/gui/skins/simple/components/Linkgrabber/LinkGrabberTreeTableTransferHandler.java @@ -43,7 +43,7 @@ public class LinkGrabberTreeTableTransferHandler extends TransferHandler { } @SuppressWarnings("unchecked") - @Override + //@Override public boolean canImport(TransferSupport info) { if (isDragging) { if (draggingObjects == null) return false; @@ -74,7 +74,7 @@ public class LinkGrabberTreeTableTransferHandler extends TransferHandler { } } - @Override + //@Override protected Transferable createTransferable(JComponent c) { isDragging = true; Vector packages = treeTable.getSelectedFilePackages(); @@ -91,7 +91,7 @@ public class LinkGrabberTreeTableTransferHandler extends TransferHandler { return new StringSelection("JDAFFE"); } - @Override + //@Override protected void exportDone(JComponent source, Transferable data, int action) { isDragging = false; } @@ -201,13 +201,13 @@ public class LinkGrabberTreeTableTransferHandler extends TransferHandler { return true; } - @Override + //@Override public int getSourceActions(JComponent c) { return MOVE; } @SuppressWarnings("unchecked") - @Override + //@Override public boolean importData(TransferSupport info) { try { Transferable tr = info.getTransferable(); diff --git a/src/jd/gui/skins/simple/config/ConfigEntriesPanel.java b/src/jd/gui/skins/simple/config/ConfigEntriesPanel.java index 68b89457e3..2c2a009b0e 100644 --- a/src/jd/gui/skins/simple/config/ConfigEntriesPanel.java +++ b/src/jd/gui/skins/simple/config/ConfigEntriesPanel.java @@ -73,7 +73,7 @@ public class ConfigEntriesPanel extends ConfigPanel { return subPanels; } - @Override + //@Override public void initPanel() { if (inited) return; this.inited = true; @@ -129,7 +129,7 @@ public class ConfigEntriesPanel extends ConfigPanel { } - @Override + //@Override public void load() { loadConfigEntries(); } @@ -146,7 +146,7 @@ public class ConfigEntriesPanel extends ConfigPanel { } - @Override + //@Override public void save() { if (subPanels != null) { for (int i = 0; i < subPanels.size(); i++) { diff --git a/src/jd/gui/skins/simple/config/ConfigPanel.java b/src/jd/gui/skins/simple/config/ConfigPanel.java index c40be6a408..25c8001995 100644 --- a/src/jd/gui/skins/simple/config/ConfigPanel.java +++ b/src/jd/gui/skins/simple/config/ConfigPanel.java @@ -168,7 +168,7 @@ public abstract class ConfigPanel extends JTabbedPanel { public abstract void save(); - @Override + //@Override public void onDisplay() { System.out.println("Display " + this); loadConfigEntries(); diff --git a/src/jd/gui/skins/simple/config/panels/ConfigPanelEventmanager.java b/src/jd/gui/skins/simple/config/panels/ConfigPanelEventmanager.java index 8dc57cfd1e..1ff9b50104 100644 --- a/src/jd/gui/skins/simple/config/panels/ConfigPanelEventmanager.java +++ b/src/jd/gui/skins/simple/config/panels/ConfigPanelEventmanager.java @@ -62,7 +62,7 @@ public class ConfigPanelEventmanager extends ConfigPanel implements ActionListen private static final long serialVersionUID = 1155282457354673850L; - @Override + //@Override public Class getColumnClass(int columnIndex) { return String.class; } @@ -71,7 +71,7 @@ public class ConfigPanelEventmanager extends ConfigPanel implements ActionListen return 3; } - @Override + //@Override public String getColumnName(int column) { switch (column) { case 0: @@ -216,7 +216,7 @@ public class ConfigPanelEventmanager extends ConfigPanel implements ActionListen pop.setVisible(true); } - @Override + //@Override public void initPanel() { @@ -271,7 +271,7 @@ public class ConfigPanelEventmanager extends ConfigPanel implements ActionListen } - @Override + //@Override public void load() { } @@ -300,7 +300,7 @@ public class ConfigPanelEventmanager extends ConfigPanel implements ActionListen this.changes = false; } - @Override + //@Override public void save() { subConfig.setProperty(Configuration.PARAM_INTERACTIONS, interactions); subConfig.save(); diff --git a/src/jd/gui/skins/simple/config/panels/ConfigPanelGUI.java b/src/jd/gui/skins/simple/config/panels/ConfigPanelGUI.java index 5941d5ab4e..fe0164028d 100644 --- a/src/jd/gui/skins/simple/config/panels/ConfigPanelGUI.java +++ b/src/jd/gui/skins/simple/config/panels/ConfigPanelGUI.java @@ -66,7 +66,7 @@ public class ConfigPanelGUI extends ConfigPanel { load(); } - @Override + //@Override public void initPanel() { ConfigContainer container = new ConfigContainer(this); @@ -246,12 +246,12 @@ public class ConfigPanelGUI extends ConfigPanel { } - @Override + //@Override public void load() { loadConfigEntries(); } - @Override + //@Override public void save() { cep.save(); subConfig.save(); diff --git a/src/jd/gui/skins/simple/config/panels/ConfigPanelGeneral.java b/src/jd/gui/skins/simple/config/panels/ConfigPanelGeneral.java index 5832974b99..9d2bfc68ac 100644 --- a/src/jd/gui/skins/simple/config/panels/ConfigPanelGeneral.java +++ b/src/jd/gui/skins/simple/config/panels/ConfigPanelGeneral.java @@ -41,7 +41,7 @@ public class ConfigPanelGeneral extends ConfigPanel { load(); } - @Override + //@Override public void initPanel() { ConfigEntry conditionEntry; @@ -59,12 +59,12 @@ ConfigGroup logging = new ConfigGroup(JDLocale.L("gui.config.general.logging", " this.add(panel, BorderLayout.NORTH); } - @Override + //@Override public void load() { loadConfigEntries(); } - @Override + //@Override public void save() { saveConfigEntries(); logger.setLevel((Level) configuration.getProperty(Configuration.PARAM_LOGGER_LEVEL)); diff --git a/src/jd/gui/skins/simple/config/panels/ConfigPanelPluginForHost.java b/src/jd/gui/skins/simple/config/panels/ConfigPanelPluginForHost.java index b27fe52a20..e036c1b034 100644 --- a/src/jd/gui/skins/simple/config/panels/ConfigPanelPluginForHost.java +++ b/src/jd/gui/skins/simple/config/panels/ConfigPanelPluginForHost.java @@ -67,7 +67,7 @@ public class ConfigPanelPluginForHost extends ConfigPanel implements ActionListe private static final long serialVersionUID = 1155282457354673850L; - @Override + //@Override public Class getColumnClass(int columnIndex) { return getValueAt(0, columnIndex).getClass(); } @@ -76,7 +76,7 @@ public class ConfigPanelPluginForHost extends ConfigPanel implements ActionListe return 6; } - @Override + //@Override public String getColumnName(int column) { switch (column) { case 0: @@ -134,12 +134,12 @@ public class ConfigPanelPluginForHost extends ConfigPanel implements ActionListe return null; } - @Override + //@Override public boolean isCellEditable(int rowIndex, int columnIndex) { return columnIndex == 3 || columnIndex == 4 || columnIndex == 5; } - @Override + //@Override public void setValueAt(Object value, int row, int col) { if (col == 3) { if ((Boolean) value) { @@ -231,7 +231,7 @@ public class ConfigPanelPluginForHost extends ConfigPanel implements ActionListe loadEntry(pluginsForHost.get(table.getSelectedRow())); } - @Override + //@Override public void initPanel() { tableModel = new InternalTableModel(); @@ -318,7 +318,7 @@ public class ConfigPanelPluginForHost extends ConfigPanel implements ActionListe this.add(bpanel, "spanx,gapleft 10, gapright 10"); } - @Override + //@Override public void load() { } @@ -346,7 +346,7 @@ public class ConfigPanelPluginForHost extends ConfigPanel implements ActionListe public void mouseReleased(MouseEvent e) { } - @Override + //@Override public void save() { Vector priority = new Vector(); for (HostPluginWrapper plg : pluginsForHost) { diff --git a/src/jd/gui/skins/simple/config/panels/ConfigPanelReconnect.java b/src/jd/gui/skins/simple/config/panels/ConfigPanelReconnect.java index f6ca5fd971..f2185b5339 100644 --- a/src/jd/gui/skins/simple/config/panels/ConfigPanelReconnect.java +++ b/src/jd/gui/skins/simple/config/panels/ConfigPanelReconnect.java @@ -107,7 +107,7 @@ public class ConfigPanelReconnect extends ConfigPanel implements ActionListener while (true) { new GuiRunnable() { - @Override + //@Override public Object runSave() { time.setText(Formatter.formatSeconds((System.currentTimeMillis() - timel) / 1000)); time.setEnabled(true); @@ -128,7 +128,7 @@ public class ConfigPanelReconnect extends ConfigPanel implements ActionListener JDUtilities.getConfiguration().setProperty(ReconnectMethod.PARAM_RETRIES, 0); progress.setStatus(30); new Thread() { - @Override + //@Override public void run() { boolean tmp = JDUtilities.getConfiguration().getBooleanProperty(Configuration.PARAM_DISABLE_RECONNECT, false); JDUtilities.getConfiguration().setProperty(Configuration.PARAM_DISABLE_RECONNECT, false); @@ -166,7 +166,7 @@ public class ConfigPanelReconnect extends ConfigPanel implements ActionListener } } - @Override + //@Override public void initPanel() { /* 0=LiveHeader, 1=Extern, 2=Batch,3=CLR */ @@ -265,7 +265,7 @@ public class ConfigPanelReconnect extends ConfigPanel implements ActionListener } - @Override + //@Override public void load() { loadConfigEntries(); } @@ -275,7 +275,7 @@ public class ConfigPanelReconnect extends ConfigPanel implements ActionListener return PropertyType.getMax(ret, super.hasChanges(), ((ConfigPanel) tabbed.getSelectedComponent()).hasChanges()); } - @Override + //@Override public void save() { saveConfigEntries(); diff --git a/src/jd/gui/skins/simple/config/subpanels/PremiumPanel.java b/src/jd/gui/skins/simple/config/subpanels/PremiumPanel.java index 6b32992cad..e30c642bf8 100644 --- a/src/jd/gui/skins/simple/config/subpanels/PremiumPanel.java +++ b/src/jd/gui/skins/simple/config/subpanels/PremiumPanel.java @@ -341,7 +341,7 @@ public class PremiumPanel extends JPanel implements ControlListener, ActionListe add(info, "skip,spanx,growx,newline"); } - @Override + //@Override public void setEnabled(final boolean flag) { if (flag == txtPassword.isEnabled()) return; SwingUtilities.invokeLater(new Runnable() { @@ -489,7 +489,7 @@ public class PremiumPanel extends JPanel implements ControlListener, ActionListe } private class ChartRefresh extends Thread { - @Override + //@Override public void run() { Long collectTraffic = new Long(0); freeTrafficChart.clear(); @@ -525,7 +525,7 @@ public class PremiumPanel extends JPanel implements ControlListener, ActionListe super(); } - @Override + //@Override public void cut() { StringSelection stringSelection = new StringSelection(String.valueOf(this.getSelectedText())); Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); @@ -541,7 +541,7 @@ public class PremiumPanel extends JPanel implements ControlListener, ActionListe this.setSelectionEnd(position); } - @Override + //@Override public void copy() { StringSelection stringSelection = new StringSelection(String.valueOf(this.getSelectedText())); Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); @@ -562,7 +562,7 @@ public class PremiumPanel extends JPanel implements ControlListener, ActionListe premiumActivated = JDUtilities.getConfiguration().getBooleanProperty(Configuration.PARAM_USE_GLOBAL_PREMIUM, true); new GuiRunnable() { - @Override + //@Override public Object runSave() { for (AccountPanel ap : accs) { if (premiumActivated) { diff --git a/src/jd/gui/skins/simple/config/subpanels/SubPanelCLRReconnect.java b/src/jd/gui/skins/simple/config/subpanels/SubPanelCLRReconnect.java index bfa7e12c57..d5844434a9 100644 --- a/src/jd/gui/skins/simple/config/subpanels/SubPanelCLRReconnect.java +++ b/src/jd/gui/skins/simple/config/subpanels/SubPanelCLRReconnect.java @@ -54,7 +54,7 @@ public class SubPanelCLRReconnect extends ConfigPanel implements ActionListener } } - @Override + //@Override public void initPanel() { JPanel buttons = new JPanel(); @@ -80,12 +80,12 @@ public class SubPanelCLRReconnect extends ConfigPanel implements ActionListener // add(routerScript); } - @Override + //@Override public void load() { loadConfigEntries(); } - @Override + //@Override public void save() { saveConfigEntries(); } diff --git a/src/jd/gui/skins/simple/config/subpanels/SubPanelLiveHeaderReconnect.java b/src/jd/gui/skins/simple/config/subpanels/SubPanelLiveHeaderReconnect.java index 8802a18f4a..7e72fc336e 100644 --- a/src/jd/gui/skins/simple/config/subpanels/SubPanelLiveHeaderReconnect.java +++ b/src/jd/gui/skins/simple/config/subpanels/SubPanelLiveHeaderReconnect.java @@ -114,7 +114,7 @@ public class SubPanelLiveHeaderReconnect extends ConfigPanel implements ActionLi } new GuiRunnable() { - @Override + //@Override public Object runSave() { JDRRGui jd = new JDRRGui(SimpleGUI.CURRENTGUI, ((JTextField) ip.getInput()[0]).getText()); jd.setModal(true); @@ -195,7 +195,7 @@ public class SubPanelLiveHeaderReconnect extends ConfigPanel implements ActionLi }); searchField.addFocusListener(new FocusAdapter() { - @Override + //@Override public void focusGained(FocusEvent e) { if (searchField.getText().equals(text)) { @@ -203,7 +203,7 @@ public class SubPanelLiveHeaderReconnect extends ConfigPanel implements ActionLi } } - @Override + //@Override public void focusLost(FocusEvent e) { if (searchField.getText().equals("")) { @@ -298,7 +298,7 @@ public class SubPanelLiveHeaderReconnect extends ConfigPanel implements ActionLi } - @Override + //@Override public void initPanel() { this.setLayout(new MigLayout("ins 0 30 0 0, wrap 2", "[grow 10,fill][grow,fill]", "[]5[]5[]")); @@ -339,12 +339,12 @@ public class SubPanelLiveHeaderReconnect extends ConfigPanel implements ActionLi // add(routerScript); } - @Override + //@Override public void load() { loadConfigEntries(); } - @Override + //@Override public void save() { saveConfigEntries(); diff --git a/src/jd/gui/skins/simple/config/subpanels/SubPanelOptionalInstaller.java b/src/jd/gui/skins/simple/config/subpanels/SubPanelOptionalInstaller.java index ccfc8c06ad..1e213b7a38 100644 --- a/src/jd/gui/skins/simple/config/subpanels/SubPanelOptionalInstaller.java +++ b/src/jd/gui/skins/simple/config/subpanels/SubPanelOptionalInstaller.java @@ -44,7 +44,7 @@ public class SubPanelOptionalInstaller extends ConfigPanel implements ActionList private static final long serialVersionUID = 1L; - @Override + //@Override public Class getColumnClass(int columnIndex) { return getValueAt(0, columnIndex).getClass(); } @@ -53,7 +53,7 @@ public class SubPanelOptionalInstaller extends ConfigPanel implements ActionList return 5; } - @Override + //@Override public String getColumnName(int column) { switch (column) { case 0: @@ -97,12 +97,12 @@ public class SubPanelOptionalInstaller extends ConfigPanel implements ActionList return ""; } - @Override + //@Override public boolean isCellEditable(int rowIndex, int columnIndex) { return columnIndex == 4; } - @Override + //@Override public void setValueAt(Object value, int row, int col) { if (col == 4) { PackageData element = packageData.get(row); @@ -138,7 +138,7 @@ public class SubPanelOptionalInstaller extends ConfigPanel implements ActionList } } - @Override + //@Override public void initPanel() { panel.setLayout(new MigLayout("ins 10,wrap 2", "[fill,grow 10]10[fill,grow]", "[fill,grow,null:150000:null][]")); @@ -231,11 +231,11 @@ public class SubPanelOptionalInstaller extends ConfigPanel implements ActionList add(panel); } - @Override + //@Override public void load() { } - @Override + //@Override public void save() { } diff --git a/src/jd/gui/skins/simple/config/subpanels/SubPanelPluginsOptional.java b/src/jd/gui/skins/simple/config/subpanels/SubPanelPluginsOptional.java index 993ad2f27d..37af00bc70 100644 --- a/src/jd/gui/skins/simple/config/subpanels/SubPanelPluginsOptional.java +++ b/src/jd/gui/skins/simple/config/subpanels/SubPanelPluginsOptional.java @@ -53,7 +53,7 @@ public class SubPanelPluginsOptional extends ConfigPanel implements ActionListen private static final long serialVersionUID = 1155282457354673850L; - @Override + //@Override public Class getColumnClass(int columnIndex) { return getValueAt(0, columnIndex).getClass(); } @@ -62,7 +62,7 @@ public class SubPanelPluginsOptional extends ConfigPanel implements ActionListen return 5; } - @Override + //@Override public String getColumnName(int column) { switch (column) { case 0: @@ -99,12 +99,12 @@ public class SubPanelPluginsOptional extends ConfigPanel implements ActionListen return null; } - @Override + //@Override public boolean isCellEditable(int rowIndex, int columnIndex) { return columnIndex == 0; } - @Override + //@Override public void setValueAt(Object value, int row, int col) { if (col == 0) { OptionalPluginWrapper plgWrapper = pluginsOptional.get(row); @@ -157,7 +157,7 @@ public class SubPanelPluginsOptional extends ConfigPanel implements ActionListen SimpleGUI.displayConfig(pluginsOptional.get(table.getSelectedRow()).getPlugin().getConfig(), 0); } - @Override + //@Override public void initPanel() { panel.setLayout(new MigLayout("ins 10,wrap 2", "[fill,grow 10]10[fill,grow]", "[fill,grow,null:150000:null][]")); @@ -201,7 +201,7 @@ public class SubPanelPluginsOptional extends ConfigPanel implements ActionListen } - @Override + //@Override public void load() { } @@ -223,7 +223,7 @@ public class SubPanelPluginsOptional extends ConfigPanel implements ActionListen public void mouseReleased(MouseEvent e) { } - @Override + //@Override public void save() { } } diff --git a/src/jd/gui/skins/simple/startmenu/actions/ExitAction.java b/src/jd/gui/skins/simple/startmenu/actions/ExitAction.java index c2d57376d5..4f87dd77b7 100644 --- a/src/jd/gui/skins/simple/startmenu/actions/ExitAction.java +++ b/src/jd/gui/skins/simple/startmenu/actions/ExitAction.java @@ -13,7 +13,7 @@ public class ExitAction extends StartAction { private static final long serialVersionUID = -1428029294638573437L; - @Override + //@Override public void init() { this.setIconDim(new Dimension(24, 24)); this.setIcon("gui.images.exit"); diff --git a/src/jd/gui/skins/simple/startmenu/actions/RestartAction.java b/src/jd/gui/skins/simple/startmenu/actions/RestartAction.java index 86ed3408e0..76d4729ba4 100644 --- a/src/jd/gui/skins/simple/startmenu/actions/RestartAction.java +++ b/src/jd/gui/skins/simple/startmenu/actions/RestartAction.java @@ -13,7 +13,7 @@ public class RestartAction extends StartAction { private static final long serialVersionUID = 1333126351380171619L; - @Override + //@Override public void init() { this.setIconDim(new Dimension(24, 24)); this.setIcon("gui.images.restart"); diff --git a/src/jd/gui/skins/simple/tasks/TaskButton.java b/src/jd/gui/skins/simple/tasks/TaskButton.java index 6472c26d7a..5d75154873 100644 --- a/src/jd/gui/skins/simple/tasks/TaskButton.java +++ b/src/jd/gui/skins/simple/tasks/TaskButton.java @@ -22,17 +22,17 @@ abstract public class TaskButton extends TaskPanel { private boolean collapsed = false; - @Override + //@Override public boolean isCollapsed() { return collapsed; } - @Override + //@Override public void setDeligateCollapsed(boolean collapsed) { setCollapsed(collapsed); } - @Override + //@Override public void setCollapsed(boolean collapsed) { super.setCollapsed(true); boolean oldValue = isCollapsed(); @@ -41,7 +41,7 @@ abstract public class TaskButton extends TaskPanel { firePropertyChange("collapsed", oldValue, isCollapsed()); } - @Override + //@Override public void mouseReleased(MouseEvent e) { broadcastEvent(new ActionEvent(this, ACTION_CLICK, "Toggle")); } diff --git a/src/jd/gui/skins/simple/tasks/TaskPanel.java b/src/jd/gui/skins/simple/tasks/TaskPanel.java index 314f33c289..809d994ab4 100644 --- a/src/jd/gui/skins/simple/tasks/TaskPanel.java +++ b/src/jd/gui/skins/simple/tasks/TaskPanel.java @@ -53,7 +53,7 @@ public abstract class TaskPanel extends JXTaskPane implements MouseListener, Pro this.setAnimated(SimpleGuiConstants.isAnimated()); JDController.getInstance().addControlListener(new ConfigPropertyListener( SimpleGuiConstants.ANIMATION_ENABLED) { - @Override + //@Override public void onPropertyChanged(Property source, String propertyName) { setAnimated(SimpleGuiConstants.isAnimated()); diff --git a/src/jd/gui/userio/SimpleUserIO.java b/src/jd/gui/userio/SimpleUserIO.java index dba4657f75..2c908d8a73 100644 --- a/src/jd/gui/userio/SimpleUserIO.java +++ b/src/jd/gui/userio/SimpleUserIO.java @@ -22,12 +22,12 @@ public class SimpleUserIO extends UserIO { return INSTANCE; } - @Override + // @Override protected String showCaptchaDialog(final int flag, final String methodname, final File captchafile, final String suggestion, final String explain) { if ((flag & UserIO.NO_USER_INTERACTION) > 0) return suggestion; return new GuiRunnable() { - @Override + // @Override public String runSave() { return new CaptchaDialog(flag, methodname, captchafile, suggestion, explain).getCaptchaText(); } @@ -43,17 +43,17 @@ public class SimpleUserIO extends UserIO { // ), "01234", null); // System.out.println("result: " + res); - UserIO.getInstance().requestConfirmDialog(UserIO.NO_COUNTDOWN|UserIO.NO_OK_OPTION, "title", "message final\r\n int flag, f\r\ninal String title, final\r\n S\r\ntring message, final Ima\r\ngeIcon icon, final String okOption, final String cancelOption) {", JDTheme.II("gui.clicknload", 32, 32), null, null); + System.out.println(UserIO.getInstance().requestConfirmDialog(UserIO.DONT_SHOW_AGAIN|UserIO.NO_COUNTDOWN | UserIO.NO_OK_OPTION, "title23", "message final\r\n int flag, f\r\ninal String title, final\r\n S\r\ntring message, final Ima\r\ngeIcon icon, final String okOption, final String cancelOption) {", JDTheme.II("gui.clicknload", 32, 32), null, null)); } - @Override - protected boolean showConfirmDialog(final int flag, final String title, final String message, final ImageIcon icon, final String okOption, final String cancelOption) { - if ((flag & UserIO.NO_USER_INTERACTION) > 0) return false; - return new GuiRunnable() { + // @Override + protected int showConfirmDialog(final int flag, final String title, final String message, final ImageIcon icon, final String okOption, final String cancelOption) { + if ((flag & UserIO.NO_USER_INTERACTION) > 0) return 0; + return new GuiRunnable() { - @Override - public Boolean runSave() { - return new ConfirmDialog(flag, title, message, icon, okOption, cancelOption).getReturnValue(); + // @Override + public Integer runSave() { + return new ConfirmDialog(flag, title, message, icon, okOption, cancelOption).getReturnID(); } }.getReturnValue(); } diff --git a/src/jd/gui/userio/dialog/AbstractDialog.java b/src/jd/gui/userio/dialog/AbstractDialog.java new file mode 100644 index 0000000000..469b372b98 --- /dev/null +++ b/src/jd/gui/userio/dialog/AbstractDialog.java @@ -0,0 +1,196 @@ +// jDownloader - Downloadmanager +// Copyright (C) 2008 JD-Team support@jdownloader.org +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + +package jd.gui.userio.dialog; + +import java.awt.Dimension; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.WindowConstants; + +import jd.config.SubConfiguration; +import jd.gui.UserIO; +import jd.gui.skins.simple.SimpleGUI; +import jd.gui.skins.simple.SimpleGuiConstants; +import jd.nutils.JDHash; +import jd.nutils.Screen; +import jd.utils.JDLocale; +import net.miginfocom.swing.MigLayout; + +public abstract class AbstractDialog extends JCountdownDialog implements ActionListener { + + /** + * + */ + private static final long serialVersionUID = -169149552591067268L; + + private static final String DIALOGS_CONFIG = "DIALOGS"; + + private JButton btnCancel; + + private JButton btnOK; + + protected JPanel contentpane; + + private int flag; + + private Object returnValue = null; + + private ImageIcon icon; + + private String okOption; + + private String cancelOption; + + private JCheckBox dont; + + public AbstractDialog(int flag, String title, ImageIcon icon, String okOption, String cancelOption) { + super(SimpleGUI.CURRENTGUI); + contentpane = new JPanel(new MigLayout("ins 0,wrap 1", "[fill,grow]", "[fill,grow]")); + this.flag = flag; + setTitle(title); + + this.icon = icon; + this.okOption = (okOption == null) ? JDLocale.L("gui.btn_ok", null) : okOption; + this.cancelOption = (okOption == null) ? JDLocale.L("gui.btn_cancel", null) : cancelOption; + + } + + public void init() { + if ((flag & UserIO.DONT_SHOW_AGAIN) > 0) { + SubConfiguration cfg = SubConfiguration.getConfig(DIALOGS_CONFIG); + // System.out.println(cfg+toString()+"This restore" + + // "DONT_SHOW_AGAIN_" + JDHash.getMD5(this.toString()) + " " + + // cfg.getProperty("DONT_SHOW_AGAIN_" + + // JDHash.getMD5(this.toString()))); + Object value; + if ((value = cfg.getProperty("DONT_SHOW_AGAIN_" + JDHash.getMD5(this.toString()))) != null) { + if (value instanceof Integer) { + int i = ((Integer) value).intValue(); + this.returnValue = (i & (UserIO.RETURN_OK | UserIO.RETURN_CANCEL)) | UserIO.RETURN_DONT_SHOW_AGAIN | UserIO.RETURN_SKIPPED_BY_DONT_SHOW; + } + return; + + } + + } + this.setModal(true); + + this.setLayout(new MigLayout("ins 5,wrap 1", "[fill,grow]")); + + btnOK = new JButton(this.okOption); + btnOK.addActionListener(this); + + btnCancel = new JButton(this.cancelOption); + btnCancel.addActionListener(this); + + this.getRootPane().setDefaultButton(btnOK); + this.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + if (icon != null) { + add(new JLabel(this.icon), "split 2,alignx left,aligny center,shrinkx,gapright 10"); + } + contentInit(contentpane); + add(contentpane, "pushx,growx,pushy,growy,spanx,aligny center,wrap"); + add(this.countDownLabel, "split 5,growx"); + + if ((flag & UserIO.DONT_SHOW_AGAIN) > 0) { + dont = new JCheckBox(); + + dont.setHorizontalAlignment(JCheckBox.TRAILING); + + add(new JLabel(JDLocale.L("gui.dialogs.dontshowthisagain", "Don't show this again"))); + add(dont, "alignx right"); + } + if ((flag & UserIO.NO_OK_OPTION) == 0) { + add(btnOK, "alignx right"); + } + if ((flag & UserIO.NO_CANCEL_OPTION) == 0) { + add(btnCancel, "alignx right"); + } + this.setMinimumSize(new Dimension(300, -1)); + this.pack(); + this.setResizable(false); + if (SimpleGUI.CURRENTGUI == null || SimpleGUI.CURRENTGUI.getExtendedState() == JFrame.ICONIFIED || !SimpleGUI.CURRENTGUI.isVisible() || !SimpleGUI.CURRENTGUI.isActive()) { + this.setLocation(Screen.getDockBottomRight(this)); + } else { + this.setLocation(Screen.getCenterOfComponent(SimpleGUI.CURRENTGUI, this)); + } + this.toFront(); + this.setAlwaysOnTop(true); + SubConfiguration cfg = SubConfiguration.getConfig(SimpleGuiConstants.GUICONFIGNAME); + if ((flag & UserIO.NO_COUNTDOWN) == 0) this.countdown(Math.max(2, cfg.getIntegerProperty(SimpleGuiConstants.PARAM_INPUTTIMEOUT, 20))); + + this.setVisible(true); + this.toFront(); + + } + + public String toString() { + return "dialog-" + this.getTitle(); + } + + abstract public void contentInit(JPanel contentpane); + + public void actionPerformed(ActionEvent e) { + if (e.getSource() == btnOK) { + setReturnValue(true); + + } else if (e.getSource() == btnCancel) { + + setReturnValue(false); + } + dispose(); + + } + + // @Override + protected void onCountdown() { + + setReturnValue(false); + this.dispose(); + } + + private void setReturnValue(boolean b) { + returnValue = b ? UserIO.RETURN_OK : UserIO.RETURN_CANCEL; + if ((flag & UserIO.DONT_SHOW_AGAIN) > 0) { + + if (dont.isSelected()) { + returnValue = b ? UserIO.RETURN_OK | UserIO.RETURN_DONT_SHOW_AGAIN : UserIO.RETURN_CANCEL | UserIO.RETURN_DONT_SHOW_AGAIN; + SubConfiguration cfg = SubConfiguration.getConfig(DIALOGS_CONFIG); + cfg.setProperty("DONT_SHOW_AGAIN_" + JDHash.getMD5(this.toString()), (Integer) returnValue); + cfg.save(); + // System.out.println(cfg+toString()+" This save" + + // "DONT_SHOW_AGAIN_" + JDHash.getMD5(this.toString()) + " " + + // returnValue); + + } + } + + } + + public Object getReturnValue() { + // TODO Auto-generated method stub + + return returnValue; + } +} diff --git a/src/jd/gui/userio/dialog/CaptchaDialog.java b/src/jd/gui/userio/dialog/CaptchaDialog.java index 86b64bd406..abec110df2 100644 --- a/src/jd/gui/userio/dialog/CaptchaDialog.java +++ b/src/jd/gui/userio/dialog/CaptchaDialog.java @@ -140,7 +140,7 @@ public class CaptchaDialog extends JCountdownDialog implements ActionListener, K // "jAntiCaptcha active!")); // final String host = plugin.getHost(); // jacThread = new Thread("JAC") { - // @Override + // //@Override // public void run() { // // String code = null; @@ -234,7 +234,7 @@ public class CaptchaDialog extends JCountdownDialog implements ActionListener, K private String code; - @Override + //@Override protected Object doInBackground() throws Exception { CaptchaController cc = new CaptchaController(method, imagefile, null, null); this.code = cc.getCode(flag | UserIO.NO_USER_INTERACTION); @@ -289,7 +289,7 @@ public class CaptchaDialog extends JCountdownDialog implements ActionListener, K public void keyTyped(KeyEvent e) { } - @Override + //@Override protected void onCountdown() { this.captchaText = textField.getText(); this.dispose(); diff --git a/src/jd/gui/userio/dialog/ConfirmDialog.java b/src/jd/gui/userio/dialog/ConfirmDialog.java index c4734a98f9..dd1570ce20 100644 --- a/src/jd/gui/userio/dialog/ConfirmDialog.java +++ b/src/jd/gui/userio/dialog/ConfirmDialog.java @@ -1,142 +1,38 @@ -// jDownloader - Downloadmanager -// Copyright (C) 2008 JD-Team support@jdownloader.org -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - package jd.gui.userio.dialog; -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JLabel; +import javax.swing.JPanel; import javax.swing.JTextPane; -import javax.swing.WindowConstants; -import jd.config.SubConfiguration; -import jd.gui.UserIO; -import jd.gui.skins.simple.SimpleGUI; -import jd.gui.skins.simple.SimpleGuiConstants; -import jd.nutils.Screen; -import jd.utils.JDLocale; -import net.miginfocom.swing.MigLayout; +public class ConfirmDialog extends AbstractDialog { -public class ConfirmDialog extends JCountdownDialog implements ActionListener { + private JTextPane textField; + private String message; + + public ConfirmDialog(int flag, String title, String message, ImageIcon icon, String okOption, String cancelOption) { + super(flag, title, icon, okOption, cancelOption); + this.message = message; + init(); + } /** * */ - private static final long serialVersionUID = -169149552591067268L; - - private JButton btnCancel; - - private JButton btnOK; - - private JTextPane textField; - - private int flag; - - private Boolean returnValue = false; - - private String message; - - private ImageIcon icon; - - private String okOption; - - private String cancelOption; - - public ConfirmDialog(int flag, String title, String message, ImageIcon icon, String okOption, String cancelOption) { - super(SimpleGUI.CURRENTGUI); - this.flag = flag; - setTitle(title); - this.message = message; - this.icon = icon; - this.okOption = (okOption == null) ? JDLocale.L("gui.btn_ok", null) : okOption; - this.cancelOption = (okOption == null) ? JDLocale.L("gui.btn_cancel", null) : cancelOption; - init(); - } - - public void init() { - - this.setModal(true); - - this.setLayout(new MigLayout("ins 5,wrap 1", "[fill,grow]")); + private static final long serialVersionUID = -7647771640756844691L; + public void contentInit(JPanel cp) { textField = new JTextPane(); textField.setBorder(null); textField.setBackground(null); textField.setOpaque(false); textField.setText(this.message); textField.setEditable(false); - - btnOK = new JButton(this.okOption); - btnOK.addActionListener(this); - - btnCancel = new JButton(this.cancelOption); - btnCancel.addActionListener(this); - - this.getRootPane().setDefaultButton(btnOK); - this.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); - if (icon != null) { - add(new JLabel(this.icon), "split 2,alignx left,aligny center,shrinkx,gapright 10"); - } - add(textField, "pushx,growx,pushy,growy,spanx,aligny center,wrap"); - add(this.countDownLabel, "split 3,growx"); - if ((flag & UserIO.NO_OK_OPTION) == 0) add(btnOK, "alignx right"); - if ((flag & UserIO.NO_CANCEL_OPTION) == 0) add(btnCancel, "alignx right"); - this.setMinimumSize(new Dimension(300, -1)); - this.pack(); - this.setResizable(false); - if (SimpleGUI.CURRENTGUI == null || SimpleGUI.CURRENTGUI.getExtendedState() == JFrame.ICONIFIED || !SimpleGUI.CURRENTGUI.isVisible() || !SimpleGUI.CURRENTGUI.isActive()) { - this.setLocation(Screen.getDockBottomRight(this)); - } else { - this.setLocation(Screen.getCenterOfComponent(SimpleGUI.CURRENTGUI, this)); - } - this.toFront(); - this.setAlwaysOnTop(true); - SubConfiguration cfg = SubConfiguration.getConfig(SimpleGuiConstants.GUICONFIGNAME); - if ((flag & UserIO.NO_COUNTDOWN) == 0) this.countdown(Math.max(2, cfg.getIntegerProperty(SimpleGuiConstants.PARAM_INPUTTIMEOUT, 20))); - - this.setVisible(true); - this.toFront(); - + cp.add(textField); } - public void actionPerformed(ActionEvent e) { - if (e.getSource() == btnOK) { - this.returnValue = true; - - } else if (e.getSource() == btnCancel) { - this.returnValue = false; - - } - dispose(); - - } - - @Override - protected void onCountdown() { - this.returnValue = false; - this.dispose(); - } - - public Boolean getReturnValue() { + public Integer getReturnID() { // TODO Auto-generated method stub - return returnValue; + return (Integer) super.getReturnValue(); } + } diff --git a/src/jd/gui/userio/dialog/JCountdownDialog.java b/src/jd/gui/userio/dialog/JCountdownDialog.java index 9734345c0a..774a84b793 100644 --- a/src/jd/gui/userio/dialog/JCountdownDialog.java +++ b/src/jd/gui/userio/dialog/JCountdownDialog.java @@ -36,7 +36,7 @@ public abstract class JCountdownDialog extends JDialog { this.countdown = time; countdownThread = new Thread() { - @Override + //@Override public void run() { while (!isVisible()) { @@ -55,7 +55,7 @@ public abstract class JCountdownDialog extends JDialog { new GuiRunnable() { - @Override + //@Override public Object runSave() { countDownLabel.setText(JDLocale.LF("gui.dialogs.countdown.label", "%s sec", left)); return null; diff --git a/src/jd/http/Browser.java b/src/jd/http/Browser.java index 6874d85ac6..4a4639e8da 100644 --- a/src/jd/http/Browser.java +++ b/src/jd/http/Browser.java @@ -887,7 +887,7 @@ public class Browser { return request.read(); } - @Override + //@Override public String toString() { if (request == null) { return "Browser. no request yet"; } return request.toString(); @@ -1464,7 +1464,7 @@ public class Browser { return new Test(); } - @Override + //@Override public void run() throws Exception { this.testRequestIntervalLimitExclusive(); diff --git a/src/jd/http/download/HTTPDownload.java b/src/jd/http/download/HTTPDownload.java index 215af59b8e..da84fd30e4 100644 --- a/src/jd/http/download/HTTPDownload.java +++ b/src/jd/http/download/HTTPDownload.java @@ -446,13 +446,13 @@ public class HTTPDownload extends DownloadInterface { this.chunks = new Threader(); chunks.getBroadcaster().addListener(chunks.new WorkerListener() { - @Override + //@Override public void onThreadException(Threader th, JDRunnable job, Exception e) { System.err.println(job); jd.controlling.JDLogger.getLogger().log(java.util.logging.Level.SEVERE,"Exception occured",e); } - @Override + //@Override public void onThreadFinished(Threader th, JDRunnable job) { try { updateActiveChunkCount(-1); @@ -482,7 +482,7 @@ public class HTTPDownload extends DownloadInterface { } - @Override + //@Override public void onThreadStarts(Threader threader, JDRunnable runnable) { updateActiveChunkCount(+1); fireEvent(new DownloadEvent(DownloadEvent.PROGRESS_CHUNK_STARTED, HTTPDownload.this, (DownloadChunk) runnable)); @@ -657,7 +657,7 @@ public class HTTPDownload extends DownloadInterface { return speed; } - @Override + //@Override public long getBandwidthLimit() { // TODO Auto-generated method stub return this.bandwidthLimit; diff --git a/src/jd/http/requests/GetRequest.java b/src/jd/http/requests/GetRequest.java index deea623b4b..2a35d5028c 100644 --- a/src/jd/http/requests/GetRequest.java +++ b/src/jd/http/requests/GetRequest.java @@ -28,12 +28,12 @@ public class GetRequest extends Request { } - @Override + //@Override public void postRequest(URLConnectionAdapter httpConnection) throws IOException { } - @Override + //@Override public void preRequest(URLConnectionAdapter httpConnection) throws IOException { httpConnection.setRequestMethod("GET"); diff --git a/src/jd/http/requests/PostFormDataRequest.java b/src/jd/http/requests/PostFormDataRequest.java index f3d455b618..f5fc2a10be 100644 --- a/src/jd/http/requests/PostFormDataRequest.java +++ b/src/jd/http/requests/PostFormDataRequest.java @@ -57,7 +57,7 @@ public class PostFormDataRequest extends Request { } - @Override + //@Override public void postRequest(URLConnectionAdapter httpConnection) throws IOException { httpConnection.setDoOutput(true); @@ -127,7 +127,7 @@ public class PostFormDataRequest extends Request { } - @Override + //@Override public void preRequest(URLConnectionAdapter httpConnection) throws IOException { httpConnection.setRequestMethod("POST"); httpConnection.setRequestProperty("Content-Type", encodeType + "; boundary=" + boundary.substring(2)); diff --git a/src/jd/http/requests/PostRequest.java b/src/jd/http/requests/PostRequest.java index 0c5d351b0f..261ac86dfe 100644 --- a/src/jd/http/requests/PostRequest.java +++ b/src/jd/http/requests/PostRequest.java @@ -70,7 +70,7 @@ public class PostRequest extends Request { this.postDataString = post; } - @Override + //@Override public void postRequest(URLConnectionAdapter httpConnection) throws IOException { httpConnection.setDoOutput(true); String parameter = postDataString != null ? postDataString : getPostDataString(); @@ -91,7 +91,7 @@ public class PostRequest extends Request { } } - @Override + //@Override public void preRequest(URLConnectionAdapter httpConnection) throws IOException { httpConnection.setRequestMethod("POST"); diff --git a/src/jd/http/requests/Request.java b/src/jd/http/requests/Request.java index 189b272e49..8e238229e1 100644 --- a/src/jd/http/requests/Request.java +++ b/src/jd/http/requests/Request.java @@ -565,7 +565,7 @@ public abstract class Request { this.readTimeout = readTimeout; } - @Override + //@Override public String toString() { if (!requested) { return "Request not sent yet"; } @@ -585,11 +585,11 @@ public abstract class Request { public Request toHeadRequest() throws MalformedURLException { Request ret = new Request(this.getUrl() + "") { - @Override + //@Override public void postRequest(URLConnectionAdapter httpConnection) throws IOException { } - @Override + //@Override public void preRequest(URLConnectionAdapter httpConnection) throws IOException { httpConnection.setRequestMethod("HEAD"); } diff --git a/src/jd/nutils/Executer.java b/src/jd/nutils/Executer.java index 83035532fe..424134c814 100644 --- a/src/jd/nutils/Executer.java +++ b/src/jd/nutils/Executer.java @@ -63,7 +63,7 @@ public class Executer extends Thread { dynbuf = buffer; } - @Override + //@Override public void run() { this.started = true; int num; @@ -211,7 +211,7 @@ public class Executer extends Thread { return waitTimeout; } - @Override + //@Override public void run() { if (command == null || command.trim().length() == 0) { logger.severe("Execute Parameter error: No Command"); diff --git a/src/jd/nutils/io/JDFileFilter.java b/src/jd/nutils/io/JDFileFilter.java index 15df36cff6..812be365fc 100644 --- a/src/jd/nutils/io/JDFileFilter.java +++ b/src/jd/nutils/io/JDFileFilter.java @@ -61,7 +61,7 @@ public class JDFileFilter extends javax.swing.filechooser.FileFilter implements this.acceptDirectories = acceptDirectories; } - @Override + //@Override public boolean accept(File f) { if (f.isDirectory()) return acceptDirectories; for (String element : extension) { @@ -73,7 +73,7 @@ public class JDFileFilter extends javax.swing.filechooser.FileFilter implements /** * Gibt die Filefilter Beschreibung zurück */ - @Override + //@Override public String getDescription() { return this.description; } diff --git a/src/jd/parser/Document.java b/src/jd/parser/Document.java index e9b27525b6..a7c548511f 100644 --- a/src/jd/parser/Document.java +++ b/src/jd/parser/Document.java @@ -33,7 +33,7 @@ public class Document extends HTMLDocumentImpl { super(ucontext, rcontext, reader, documentURI); } - @Override + //@Override public void write(String arg0) { content.append(arg0); super.write(arg0); diff --git a/src/jd/parser/Regex.java b/src/jd/parser/Regex.java index 908286f029..7bb799a19e 100644 --- a/src/jd/parser/Regex.java +++ b/src/jd/parser/Regex.java @@ -217,7 +217,7 @@ public class Regex { this.matcher = matcher; } - @Override + //@Override public String toString() { StringBuilder ret = new StringBuilder(); String[][] match = getMatches(); diff --git a/src/jd/plugins/Account.java b/src/jd/plugins/Account.java index ab23b3b8dc..32eceb1389 100644 --- a/src/jd/plugins/Account.java +++ b/src/jd/plugins/Account.java @@ -85,7 +85,7 @@ public class Account extends Property { if (this.user != null) this.user = this.user.trim(); } - @Override + //@Override public String toString() { return user + ":" + pass + " " + status + " " + enabled + " " + super.toString(); } diff --git a/src/jd/plugins/ContainerStatus.java b/src/jd/plugins/ContainerStatus.java index 617b6aeb16..f63527542e 100644 --- a/src/jd/plugins/ContainerStatus.java +++ b/src/jd/plugins/ContainerStatus.java @@ -94,7 +94,7 @@ public class ContainerStatus { return statusText; } - @Override + //@Override public String toString() { Class cl = this.getClass(); Field[] fields = cl.getDeclaredFields(); diff --git a/src/jd/plugins/CryptedLink.java b/src/jd/plugins/CryptedLink.java index 144766b284..2e033174cf 100644 --- a/src/jd/plugins/CryptedLink.java +++ b/src/jd/plugins/CryptedLink.java @@ -91,7 +91,7 @@ public class CryptedLink extends Property { /** * Gibt die CryptedUrl zurück, welche vom Decrypter-Plugin verarbeitet wird */ - @Override + //@Override public String toString() { return this.cryptedUrl; } diff --git a/src/jd/plugins/DownloadLink.java b/src/jd/plugins/DownloadLink.java index 949aa377ce..2ebc72f30d 100644 --- a/src/jd/plugins/DownloadLink.java +++ b/src/jd/plugins/DownloadLink.java @@ -55,7 +55,7 @@ import jd.utils.JDUtilities; class DownloadLinkBroadcaster extends JDBroadcaster { - @Override + //@Override protected void fireEvent(DownloadLinkListener listener, DownloadLinkEvent event) { listener.handle_DownloadLinkEvent(event); } @@ -988,7 +988,7 @@ public class DownloadLink extends Property implements Serializable, Comparable " + getFileOutput() + "(" + getHost() + ")"; } diff --git a/src/jd/plugins/FilePackage.java b/src/jd/plugins/FilePackage.java index ff09b113b4..ca09428abf 100644 --- a/src/jd/plugins/FilePackage.java +++ b/src/jd/plugins/FilePackage.java @@ -33,7 +33,7 @@ import jd.utils.JDUtilities; class FilePackageBroadcaster extends JDBroadcaster { - @Override + //@Override protected void fireEvent(FilePackageListener listener, FilePackageEvent event) { listener.onFilePackageEvent(event); } @@ -572,7 +572,7 @@ public class FilePackage extends Property implements Serializable, DownloadLinkL /** * Alles undokumentiert, da selbsterklärend */ - @Override + //@Override public String toString() { return this.getName() + " " + this.size(); } diff --git a/src/jd/plugins/LinkStatus.java b/src/jd/plugins/LinkStatus.java index a767bf820a..d3f501790d 100644 --- a/src/jd/plugins/LinkStatus.java +++ b/src/jd/plugins/LinkStatus.java @@ -406,7 +406,7 @@ public class LinkStatus implements Serializable { return null; } - @Override + //@Override public String toString() { Class cl = this.getClass(); Field[] fields = cl.getDeclaredFields(); diff --git a/src/jd/plugins/PluginForDecrypt.java b/src/jd/plugins/PluginForDecrypt.java index 7f5c718bc5..a25c6b0cd2 100644 --- a/src/jd/plugins/PluginForDecrypt.java +++ b/src/jd/plugins/PluginForDecrypt.java @@ -113,7 +113,7 @@ public abstract class PluginForDecrypt extends Plugin { return dl; } - @Override + //@Override public ArrayList createMenuitems() { return null; } @@ -278,7 +278,7 @@ public abstract class PluginForDecrypt extends Plugin { this.plg = plg; } - @Override + //@Override public void run() { ArrayList links = plg.decryptLink(decryptableLink); for (DownloadLink link : links) { diff --git a/src/jd/plugins/PluginForHost.java b/src/jd/plugins/PluginForHost.java index 4be3816829..f9120d4835 100644 --- a/src/jd/plugins/PluginForHost.java +++ b/src/jd/plugins/PluginForHost.java @@ -132,7 +132,7 @@ public abstract class PluginForHost extends Plugin { return false; } - @Override + //@Override public void clean() { dl = null; super.clean(); @@ -154,7 +154,7 @@ public abstract class PluginForHost extends Plugin { br.clearCookies(getHost()); } - @Override + //@Override public void actionPerformed(ActionEvent e) { if (e.getID() == 1) { SimpleGUI.displayConfig(config, 0); @@ -203,7 +203,7 @@ public abstract class PluginForHost extends Plugin { accountWithoutUsername = b; } - @Override + //@Override public ArrayList createMenuitems() { ArrayList menuList = new ArrayList(); diff --git a/src/jd/plugins/PluginOptional.java b/src/jd/plugins/PluginOptional.java index 7194e4eb75..9dfb6ec766 100644 --- a/src/jd/plugins/PluginOptional.java +++ b/src/jd/plugins/PluginOptional.java @@ -52,7 +52,7 @@ public abstract class PluginOptional extends Plugin implements ControlListener { public abstract String getRequirements(); - @Override + //@Override public Pattern getSupportedLinks() { return null; } diff --git a/src/jd/plugins/PluginsC.java b/src/jd/plugins/PluginsC.java index 04ce2f4fb9..6ec12363da 100644 --- a/src/jd/plugins/PluginsC.java +++ b/src/jd/plugins/PluginsC.java @@ -74,7 +74,7 @@ public abstract class PluginsC extends Plugin { public abstract ContainerStatus callDecryption(File file); - @Override + //@Override public synchronized boolean canHandle(String data) { if (data == null) { return false; } String match = new Regex(data, this.getSupportedLinks()).getMatch(-1); @@ -86,7 +86,7 @@ public abstract class PluginsC extends Plugin { return null; } - @Override + //@Override public ArrayList createMenuitems() { return null; } diff --git a/src/jd/plugins/decrypt/AllStreamInfo.java b/src/jd/plugins/decrypt/AllStreamInfo.java index 6a28b40d58..e20b1375ab 100644 --- a/src/jd/plugins/decrypt/AllStreamInfo.java +++ b/src/jd/plugins/decrypt/AllStreamInfo.java @@ -30,7 +30,7 @@ public class AllStreamInfo extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); br.getPage(param.toString()); @@ -43,7 +43,7 @@ public class AllStreamInfo extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/AlphaLink.java b/src/jd/plugins/decrypt/AlphaLink.java index 586aa141c0..da3af83424 100644 --- a/src/jd/plugins/decrypt/AlphaLink.java +++ b/src/jd/plugins/decrypt/AlphaLink.java @@ -32,7 +32,7 @@ public class AlphaLink extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -54,7 +54,7 @@ public class AlphaLink extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/AnimeANet.java b/src/jd/plugins/decrypt/AnimeANet.java index 5eb898092b..9ba62c749c 100644 --- a/src/jd/plugins/decrypt/AnimeANet.java +++ b/src/jd/plugins/decrypt/AnimeANet.java @@ -31,7 +31,7 @@ public class AnimeANet extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -56,7 +56,7 @@ public class AnimeANet extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/AnimeLoadsorg.java b/src/jd/plugins/decrypt/AnimeLoadsorg.java index 264a195407..ead8b9959f 100644 --- a/src/jd/plugins/decrypt/AnimeLoadsorg.java +++ b/src/jd/plugins/decrypt/AnimeLoadsorg.java @@ -32,7 +32,7 @@ public class AnimeLoadsorg extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); ArrayList links = new ArrayList(); @@ -61,7 +61,7 @@ public class AnimeLoadsorg extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/BadongoCom.java b/src/jd/plugins/decrypt/BadongoCom.java index 73db7134fd..5343e647a2 100644 --- a/src/jd/plugins/decrypt/BadongoCom.java +++ b/src/jd/plugins/decrypt/BadongoCom.java @@ -16,7 +16,7 @@ public class BadongoCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -48,7 +48,7 @@ public class BadongoCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/BestMovies.java b/src/jd/plugins/decrypt/BestMovies.java index 958e135a81..90ee8171ca 100644 --- a/src/jd/plugins/decrypt/BestMovies.java +++ b/src/jd/plugins/decrypt/BestMovies.java @@ -44,7 +44,7 @@ public class BestMovies extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -91,7 +91,7 @@ public class BestMovies extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/BlogXXNet.java b/src/jd/plugins/decrypt/BlogXXNet.java index 9cbdb35f08..a662da25b9 100644 --- a/src/jd/plugins/decrypt/BlogXXNet.java +++ b/src/jd/plugins/decrypt/BlogXXNet.java @@ -32,7 +32,7 @@ public class BlogXXNet extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -56,7 +56,7 @@ public class BlogXXNet extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Bm4uin.java b/src/jd/plugins/decrypt/Bm4uin.java index 2e07580240..b4ff6dfc8a 100644 --- a/src/jd/plugins/decrypt/Bm4uin.java +++ b/src/jd/plugins/decrypt/Bm4uin.java @@ -31,7 +31,7 @@ public class Bm4uin extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -51,7 +51,7 @@ public class Bm4uin extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/BrazilSeriesCom.java b/src/jd/plugins/decrypt/BrazilSeriesCom.java index 9aab6b0912..9510cf8e01 100644 --- a/src/jd/plugins/decrypt/BrazilSeriesCom.java +++ b/src/jd/plugins/decrypt/BrazilSeriesCom.java @@ -73,7 +73,7 @@ public class BrazilSeriesCom extends PluginForDecrypt { setConfigElements(); } - @Override + //@Override public ArrayList decryptIt(CryptedLink cryptedLink, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String url = cryptedLink.getCryptedUrl(); @@ -130,7 +130,7 @@ public class BrazilSeriesCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Charts4You.java b/src/jd/plugins/decrypt/Charts4You.java index e29468e22e..98a9f0b3ce 100644 --- a/src/jd/plugins/decrypt/Charts4You.java +++ b/src/jd/plugins/decrypt/Charts4You.java @@ -40,7 +40,7 @@ public class Charts4You extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -72,7 +72,7 @@ public class Charts4You extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/CineTo.java b/src/jd/plugins/decrypt/CineTo.java index 3107d8c93c..08c779a204 100644 --- a/src/jd/plugins/decrypt/CineTo.java +++ b/src/jd/plugins/decrypt/CineTo.java @@ -37,7 +37,7 @@ public class CineTo extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { String parameter = param.toString(); ArrayList decryptedLinks = new ArrayList(); @@ -68,7 +68,7 @@ public class CineTo extends PluginForDecrypt { } } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/ClipfishDe.java b/src/jd/plugins/decrypt/ClipfishDe.java index fba5e69073..a4575007b5 100644 --- a/src/jd/plugins/decrypt/ClipfishDe.java +++ b/src/jd/plugins/decrypt/ClipfishDe.java @@ -41,7 +41,7 @@ public class ClipfishDe extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink cryptedLink, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); br.clearCookies(getHost()); @@ -83,7 +83,7 @@ public class ClipfishDe extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Collectr.java b/src/jd/plugins/decrypt/Collectr.java index 8f6a084ea2..9d569879d7 100644 --- a/src/jd/plugins/decrypt/Collectr.java +++ b/src/jd/plugins/decrypt/Collectr.java @@ -47,7 +47,7 @@ public class Collectr extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String url = param.toString(); @@ -97,7 +97,7 @@ public class Collectr extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/CounterstrikeDe.java b/src/jd/plugins/decrypt/CounterstrikeDe.java index a5e7792679..944eb58bbf 100644 --- a/src/jd/plugins/decrypt/CounterstrikeDe.java +++ b/src/jd/plugins/decrypt/CounterstrikeDe.java @@ -31,7 +31,7 @@ public class CounterstrikeDe extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); @@ -49,7 +49,7 @@ public class CounterstrikeDe extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/CryptItCom.java b/src/jd/plugins/decrypt/CryptItCom.java index ec71536c48..76a108c53f 100644 --- a/src/jd/plugins/decrypt/CryptItCom.java +++ b/src/jd/plugins/decrypt/CryptItCom.java @@ -123,7 +123,7 @@ public class CryptItCom extends PluginForDecrypt { return new String(cipher).trim(); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); try { @@ -192,7 +192,7 @@ public class CryptItCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/CryptMeCom.java b/src/jd/plugins/decrypt/CryptMeCom.java index a0fdcfd30e..21caf6a565 100644 --- a/src/jd/plugins/decrypt/CryptMeCom.java +++ b/src/jd/plugins/decrypt/CryptMeCom.java @@ -35,7 +35,7 @@ public class CryptMeCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -72,7 +72,7 @@ public class CryptMeCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/CryptingCC.java b/src/jd/plugins/decrypt/CryptingCC.java index e96bfe51cf..fb0cf09208 100644 --- a/src/jd/plugins/decrypt/CryptingCC.java +++ b/src/jd/plugins/decrypt/CryptingCC.java @@ -38,7 +38,7 @@ public class CryptingCC extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -127,7 +127,7 @@ public class CryptingCC extends PluginForDecrypt { return false; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/CryptingIt.java b/src/jd/plugins/decrypt/CryptingIt.java index fbca697f86..c296de2de9 100644 --- a/src/jd/plugins/decrypt/CryptingIt.java +++ b/src/jd/plugins/decrypt/CryptingIt.java @@ -35,7 +35,7 @@ public class CryptingIt extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -59,7 +59,7 @@ public class CryptingIt extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Cryptlinkws.java b/src/jd/plugins/decrypt/Cryptlinkws.java index 65977b027b..3ac1d2d806 100644 --- a/src/jd/plugins/decrypt/Cryptlinkws.java +++ b/src/jd/plugins/decrypt/Cryptlinkws.java @@ -39,7 +39,7 @@ public class Cryptlinkws extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -126,7 +126,7 @@ public class Cryptlinkws extends PluginForDecrypt { return link; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/CrystalWarezIN.java b/src/jd/plugins/decrypt/CrystalWarezIN.java index b27cbaafa8..87f65c5473 100644 --- a/src/jd/plugins/decrypt/CrystalWarezIN.java +++ b/src/jd/plugins/decrypt/CrystalWarezIN.java @@ -37,7 +37,7 @@ public class CrystalWarezIN extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { String parameter = param.toString(); ArrayList decryptedLinks = new ArrayList(); @@ -76,7 +76,7 @@ public class CrystalWarezIN extends PluginForDecrypt { } } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/DDLMusicOrg.java b/src/jd/plugins/decrypt/DDLMusicOrg.java index 6f4dba70c7..eed015040e 100644 --- a/src/jd/plugins/decrypt/DDLMusicOrg.java +++ b/src/jd/plugins/decrypt/DDLMusicOrg.java @@ -33,7 +33,7 @@ public class DDLMusicOrg extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -83,7 +83,7 @@ public class DDLMusicOrg extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/DreiDlAm.java b/src/jd/plugins/decrypt/DreiDlAm.java index f4339c002d..81b43e56a4 100644 --- a/src/jd/plugins/decrypt/DreiDlAm.java +++ b/src/jd/plugins/decrypt/DreiDlAm.java @@ -85,7 +85,7 @@ public class DreiDlAm extends PluginForDecrypt { return linksReturn; } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -124,7 +124,7 @@ public class DreiDlAm extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/EinsKhDe.java b/src/jd/plugins/decrypt/EinsKhDe.java index e79502dc38..bc4d37ee06 100644 --- a/src/jd/plugins/decrypt/EinsKhDe.java +++ b/src/jd/plugins/decrypt/EinsKhDe.java @@ -41,7 +41,7 @@ public class EinsKhDe extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -90,7 +90,7 @@ public class EinsKhDe extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/FDNLinksCom.java b/src/jd/plugins/decrypt/FDNLinksCom.java index 5ef66dff0a..ffeb8d8c8e 100644 --- a/src/jd/plugins/decrypt/FDNLinksCom.java +++ b/src/jd/plugins/decrypt/FDNLinksCom.java @@ -34,7 +34,7 @@ public class FDNLinksCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -97,7 +97,7 @@ public class FDNLinksCom extends PluginForDecrypt { return v5; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/FalinksCom.java b/src/jd/plugins/decrypt/FalinksCom.java index 51461ab07b..1d45348353 100644 --- a/src/jd/plugins/decrypt/FalinksCom.java +++ b/src/jd/plugins/decrypt/FalinksCom.java @@ -31,7 +31,7 @@ public class FalinksCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -54,7 +54,7 @@ public class FalinksCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/FileFactoryFolder.java b/src/jd/plugins/decrypt/FileFactoryFolder.java index 6d8a0c2721..20ac1cc048 100644 --- a/src/jd/plugins/decrypt/FileFactoryFolder.java +++ b/src/jd/plugins/decrypt/FileFactoryFolder.java @@ -31,7 +31,7 @@ public class FileFactoryFolder extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -57,7 +57,7 @@ public class FileFactoryFolder extends PluginForDecrypt { } } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/FileUploadnet.java b/src/jd/plugins/decrypt/FileUploadnet.java index 88b361edd2..5b8a0846c8 100644 --- a/src/jd/plugins/decrypt/FileUploadnet.java +++ b/src/jd/plugins/decrypt/FileUploadnet.java @@ -31,7 +31,7 @@ public class FileUploadnet extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -48,7 +48,7 @@ public class FileUploadnet extends PluginForDecrypt { } } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Filer.java b/src/jd/plugins/decrypt/Filer.java index 5ac372f26e..cb2ad22bfc 100644 --- a/src/jd/plugins/decrypt/Filer.java +++ b/src/jd/plugins/decrypt/Filer.java @@ -31,7 +31,7 @@ public class Filer extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -51,7 +51,7 @@ public class Filer extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/FilmatoriumCn.java b/src/jd/plugins/decrypt/FilmatoriumCn.java index 9c580e416b..c71a27ba4a 100644 --- a/src/jd/plugins/decrypt/FilmatoriumCn.java +++ b/src/jd/plugins/decrypt/FilmatoriumCn.java @@ -30,7 +30,7 @@ public class FilmatoriumCn extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -49,7 +49,7 @@ public class FilmatoriumCn extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/FreakShareFolder.java b/src/jd/plugins/decrypt/FreakShareFolder.java index c98248a9dc..bcd2a132d5 100644 --- a/src/jd/plugins/decrypt/FreakShareFolder.java +++ b/src/jd/plugins/decrypt/FreakShareFolder.java @@ -31,7 +31,7 @@ public class FreakShareFolder extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink parameter, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); br.getPage(parameter.getCryptedUrl()); @@ -42,7 +42,7 @@ public class FreakShareFolder extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/FrozenRomsIn.java b/src/jd/plugins/decrypt/FrozenRomsIn.java index 72b1a145b3..2685ac835e 100644 --- a/src/jd/plugins/decrypt/FrozenRomsIn.java +++ b/src/jd/plugins/decrypt/FrozenRomsIn.java @@ -32,7 +32,7 @@ public class FrozenRomsIn extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -54,7 +54,7 @@ public class FrozenRomsIn extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/GoogleGroups.java b/src/jd/plugins/decrypt/GoogleGroups.java index 06234b1eba..f90172ec84 100644 --- a/src/jd/plugins/decrypt/GoogleGroups.java +++ b/src/jd/plugins/decrypt/GoogleGroups.java @@ -31,7 +31,7 @@ public class GoogleGroups extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); @@ -47,7 +47,7 @@ public class GoogleGroups extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Gwarezcc.java b/src/jd/plugins/decrypt/Gwarezcc.java index c851f17746..723cfa082b 100644 --- a/src/jd/plugins/decrypt/Gwarezcc.java +++ b/src/jd/plugins/decrypt/Gwarezcc.java @@ -51,7 +51,7 @@ public class Gwarezcc extends PluginForDecrypt { setConfigElements(); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -190,7 +190,7 @@ public class Gwarezcc extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/HiderAthCx.java b/src/jd/plugins/decrypt/HiderAthCx.java index 99064fc276..91455f7663 100644 --- a/src/jd/plugins/decrypt/HiderAthCx.java +++ b/src/jd/plugins/decrypt/HiderAthCx.java @@ -30,7 +30,7 @@ public class HiderAthCx extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -42,7 +42,7 @@ public class HiderAthCx extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Hideurlbiz.java b/src/jd/plugins/decrypt/Hideurlbiz.java index a733c41f7f..f33f295063 100644 --- a/src/jd/plugins/decrypt/Hideurlbiz.java +++ b/src/jd/plugins/decrypt/Hideurlbiz.java @@ -31,7 +31,7 @@ public class Hideurlbiz extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -55,7 +55,7 @@ public class Hideurlbiz extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Hubuploadcom.java b/src/jd/plugins/decrypt/Hubuploadcom.java index cb37403362..601a416fa2 100644 --- a/src/jd/plugins/decrypt/Hubuploadcom.java +++ b/src/jd/plugins/decrypt/Hubuploadcom.java @@ -33,7 +33,7 @@ public class Hubuploadcom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -49,7 +49,7 @@ public class Hubuploadcom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/ILoadTo.java b/src/jd/plugins/decrypt/ILoadTo.java index 3995442f68..af7dcc5247 100644 --- a/src/jd/plugins/decrypt/ILoadTo.java +++ b/src/jd/plugins/decrypt/ILoadTo.java @@ -34,7 +34,7 @@ public class ILoadTo extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -59,7 +59,7 @@ public class ILoadTo extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/ImagefapCom.java b/src/jd/plugins/decrypt/ImagefapCom.java index 14dadd7ec3..c1d45aade5 100644 --- a/src/jd/plugins/decrypt/ImagefapCom.java +++ b/src/jd/plugins/decrypt/ImagefapCom.java @@ -30,7 +30,7 @@ public class ImagefapCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -50,7 +50,7 @@ public class ImagefapCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/JDLoader.java b/src/jd/plugins/decrypt/JDLoader.java index 14083074ac..d824b08fff 100644 --- a/src/jd/plugins/decrypt/JDLoader.java +++ b/src/jd/plugins/decrypt/JDLoader.java @@ -39,7 +39,7 @@ public class JDLoader extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink parameter, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String format = null; @@ -74,7 +74,7 @@ public class JDLoader extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/JamendoCom.java b/src/jd/plugins/decrypt/JamendoCom.java index 15003a4ca5..6894beb6f2 100644 --- a/src/jd/plugins/decrypt/JamendoCom.java +++ b/src/jd/plugins/decrypt/JamendoCom.java @@ -23,7 +23,7 @@ public class JamendoCom extends PluginForDecrypt { setConfigElements(); } - @Override + //@Override public ArrayList decryptIt(CryptedLink parameter, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); if (parameter.toString().contains("/album")) { @@ -62,7 +62,7 @@ public class JamendoCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/JokeAroundOrg.java b/src/jd/plugins/decrypt/JokeAroundOrg.java index 3ce0e776aa..a57f5273ab 100644 --- a/src/jd/plugins/decrypt/JokeAroundOrg.java +++ b/src/jd/plugins/decrypt/JokeAroundOrg.java @@ -31,7 +31,7 @@ public class JokeAroundOrg extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -64,7 +64,7 @@ public class JokeAroundOrg extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/KnofflCom.java b/src/jd/plugins/decrypt/KnofflCom.java index 1888fe47a2..01dc72f8c5 100644 --- a/src/jd/plugins/decrypt/KnofflCom.java +++ b/src/jd/plugins/decrypt/KnofflCom.java @@ -30,7 +30,7 @@ public class KnofflCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -43,7 +43,7 @@ public class KnofflCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/LinkBankeu.java b/src/jd/plugins/decrypt/LinkBankeu.java index 49920449d2..f706163769 100644 --- a/src/jd/plugins/decrypt/LinkBankeu.java +++ b/src/jd/plugins/decrypt/LinkBankeu.java @@ -36,7 +36,7 @@ public class LinkBankeu extends PluginForDecrypt { setConfigElements(); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -57,7 +57,7 @@ public class LinkBankeu extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/LinkBeeCom.java b/src/jd/plugins/decrypt/LinkBeeCom.java index fdd324490a..2e6d1ee0f8 100644 --- a/src/jd/plugins/decrypt/LinkBeeCom.java +++ b/src/jd/plugins/decrypt/LinkBeeCom.java @@ -30,7 +30,7 @@ public class LinkBeeCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -42,7 +42,7 @@ public class LinkBeeCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/LinkBucks.java b/src/jd/plugins/decrypt/LinkBucks.java index 321b6b618b..8500e56f0a 100644 --- a/src/jd/plugins/decrypt/LinkBucks.java +++ b/src/jd/plugins/decrypt/LinkBucks.java @@ -31,7 +31,7 @@ public class LinkBucks extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -47,7 +47,7 @@ public class LinkBucks extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/LinkCryptWs.java b/src/jd/plugins/decrypt/LinkCryptWs.java index 4caad29a46..bff14ae8cd 100644 --- a/src/jd/plugins/decrypt/LinkCryptWs.java +++ b/src/jd/plugins/decrypt/LinkCryptWs.java @@ -48,7 +48,7 @@ public class LinkCryptWs extends PluginForDecrypt { * @see jd.plugins.PluginForDecrypt#decryptIt(jd.plugins.CryptedLink, * jd.controlling.ProgressController) */ - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -98,7 +98,7 @@ public class LinkCryptWs extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/LinkProtectIn.java b/src/jd/plugins/decrypt/LinkProtectIn.java index 25fd66e088..37e42eed10 100644 --- a/src/jd/plugins/decrypt/LinkProtectIn.java +++ b/src/jd/plugins/decrypt/LinkProtectIn.java @@ -43,7 +43,7 @@ public class LinkProtectIn extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -135,7 +135,7 @@ public class LinkProtectIn extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/LinkProtectionOrg.java b/src/jd/plugins/decrypt/LinkProtectionOrg.java index b99f8494fc..213ce4f820 100644 --- a/src/jd/plugins/decrypt/LinkProtectionOrg.java +++ b/src/jd/plugins/decrypt/LinkProtectionOrg.java @@ -31,7 +31,7 @@ public class LinkProtectionOrg extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); br.getPage(param.toString()); @@ -39,7 +39,7 @@ public class LinkProtectionOrg extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/LinkProtectorCom.java b/src/jd/plugins/decrypt/LinkProtectorCom.java index a0bb839c4a..dcd222ff06 100644 --- a/src/jd/plugins/decrypt/LinkProtectorCom.java +++ b/src/jd/plugins/decrypt/LinkProtectorCom.java @@ -44,7 +44,7 @@ public class LinkProtectorCom extends PluginForDecrypt { return result; } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -84,7 +84,7 @@ public class LinkProtectorCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/LinkSafeWs.java b/src/jd/plugins/decrypt/LinkSafeWs.java index 8d98b7c47d..c8f46252c6 100644 --- a/src/jd/plugins/decrypt/LinkSafeWs.java +++ b/src/jd/plugins/decrypt/LinkSafeWs.java @@ -32,7 +32,7 @@ public class LinkSafeWs extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -54,7 +54,7 @@ public class LinkSafeWs extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/LinkShareOrg.java b/src/jd/plugins/decrypt/LinkShareOrg.java index 516bf3e5de..e11ffa8cb7 100644 --- a/src/jd/plugins/decrypt/LinkShareOrg.java +++ b/src/jd/plugins/decrypt/LinkShareOrg.java @@ -35,7 +35,7 @@ public class LinkShareOrg extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -77,7 +77,7 @@ public class LinkShareOrg extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/LinkbaseBiz.java b/src/jd/plugins/decrypt/LinkbaseBiz.java index 6a37ececca..fa0e7246ec 100644 --- a/src/jd/plugins/decrypt/LinkbaseBiz.java +++ b/src/jd/plugins/decrypt/LinkbaseBiz.java @@ -60,7 +60,7 @@ public class LinkbaseBiz extends PluginForDecrypt { return this.downloadlink; } - @Override + //@Override public void run() { if (this.gotjob == true) { logger.finest("LinkbaseBiz_Linkgrabber: id=" + new Integer(this.Worker_ID) + " started!"); @@ -104,7 +104,7 @@ public class LinkbaseBiz extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -188,7 +188,7 @@ public class LinkbaseBiz extends PluginForDecrypt { return sb.toString(); } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/LinkcryptCom.java b/src/jd/plugins/decrypt/LinkcryptCom.java index 4f2002ee98..3e463268ce 100644 --- a/src/jd/plugins/decrypt/LinkcryptCom.java +++ b/src/jd/plugins/decrypt/LinkcryptCom.java @@ -33,7 +33,7 @@ public class LinkcryptCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -72,7 +72,7 @@ public class LinkcryptCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/LinkrAt.java b/src/jd/plugins/decrypt/LinkrAt.java index 76c874642d..9c3986a8f4 100644 --- a/src/jd/plugins/decrypt/LinkrAt.java +++ b/src/jd/plugins/decrypt/LinkrAt.java @@ -35,7 +35,7 @@ public class LinkrAt extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink cryptedLink, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String url = cryptedLink.getCryptedUrl(); @@ -53,7 +53,7 @@ public class LinkrAt extends PluginForDecrypt { return decryptedLinks.size() > 0 ? decryptedLinks : null; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/LinksaveIn.java b/src/jd/plugins/decrypt/LinksaveIn.java index 11f3894015..1aa836b8bc 100644 --- a/src/jd/plugins/decrypt/LinksaveIn.java +++ b/src/jd/plugins/decrypt/LinksaveIn.java @@ -38,7 +38,7 @@ public class LinksaveIn extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { br.getPage(param.getCryptedUrl()); @@ -102,12 +102,12 @@ public class LinksaveIn extends PluginForDecrypt { return new ArrayList(); } - @Override + //@Override protected boolean isClickNLoadEnabled() { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Linkshield.java b/src/jd/plugins/decrypt/Linkshield.java index ecbc80d78e..9e81f952ee 100644 --- a/src/jd/plugins/decrypt/Linkshield.java +++ b/src/jd/plugins/decrypt/Linkshield.java @@ -30,7 +30,7 @@ public class Linkshield extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -43,7 +43,7 @@ public class Linkshield extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Lixin.java b/src/jd/plugins/decrypt/Lixin.java index e5c9af806b..795a18578e 100644 --- a/src/jd/plugins/decrypt/Lixin.java +++ b/src/jd/plugins/decrypt/Lixin.java @@ -40,7 +40,7 @@ public class Lixin extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -100,7 +100,7 @@ public class Lixin extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/MediafireFolder.java b/src/jd/plugins/decrypt/MediafireFolder.java index b8c0f40b2a..d19a193f83 100644 --- a/src/jd/plugins/decrypt/MediafireFolder.java +++ b/src/jd/plugins/decrypt/MediafireFolder.java @@ -31,7 +31,7 @@ public class MediafireFolder extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -58,7 +58,7 @@ public class MediafireFolder extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/MegauploadComFolder.java b/src/jd/plugins/decrypt/MegauploadComFolder.java index 199c0ac37f..465db32ea7 100644 --- a/src/jd/plugins/decrypt/MegauploadComFolder.java +++ b/src/jd/plugins/decrypt/MegauploadComFolder.java @@ -31,7 +31,7 @@ public class MegauploadComFolder extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { String id = Request.parseQuery(param.getCryptedUrl()).get("f"); String url = "http://www.megaupload.com/xml/folderfiles.php?folderid=" + id; @@ -45,7 +45,7 @@ public class MegauploadComFolder extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/MusicBaseWs.java b/src/jd/plugins/decrypt/MusicBaseWs.java index f802243887..c2967ca73d 100644 --- a/src/jd/plugins/decrypt/MusicBaseWs.java +++ b/src/jd/plugins/decrypt/MusicBaseWs.java @@ -30,7 +30,7 @@ public class MusicBaseWs extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -40,7 +40,7 @@ public class MusicBaseWs extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/MyRef.java b/src/jd/plugins/decrypt/MyRef.java index 6c1fdeef63..142faa81ba 100644 --- a/src/jd/plugins/decrypt/MyRef.java +++ b/src/jd/plugins/decrypt/MyRef.java @@ -31,7 +31,7 @@ public class MyRef extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -42,7 +42,7 @@ public class MyRef extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/MySpaceCom.java b/src/jd/plugins/decrypt/MySpaceCom.java index 1f9ffdaaaf..39b28e4ed2 100644 --- a/src/jd/plugins/decrypt/MySpaceCom.java +++ b/src/jd/plugins/decrypt/MySpaceCom.java @@ -74,7 +74,7 @@ public class MySpaceCom extends PluginForDecrypt { setConfigElements(); } - @Override + //@Override public ArrayList decryptIt(CryptedLink cryptedLink, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); br.setCookiesExclusive(true); @@ -271,7 +271,7 @@ public class MySpaceCom extends PluginForDecrypt { return ret; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Myupcc.java b/src/jd/plugins/decrypt/Myupcc.java index 53073670f5..f48bfdcdb1 100644 --- a/src/jd/plugins/decrypt/Myupcc.java +++ b/src/jd/plugins/decrypt/Myupcc.java @@ -30,7 +30,7 @@ public class Myupcc extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -42,7 +42,7 @@ public class Myupcc extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/MyvideoDe.java b/src/jd/plugins/decrypt/MyvideoDe.java index 4f8a9ca9a4..32ad28706b 100644 --- a/src/jd/plugins/decrypt/MyvideoDe.java +++ b/src/jd/plugins/decrypt/MyvideoDe.java @@ -34,7 +34,7 @@ public class MyvideoDe extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList possibleconverts = new ArrayList(); ArrayList decryptedLinks = new ArrayList(); @@ -66,7 +66,7 @@ public class MyvideoDe extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/NetfolderIn.java b/src/jd/plugins/decrypt/NetfolderIn.java index 264cbc9b22..7037b7abca 100644 --- a/src/jd/plugins/decrypt/NetfolderIn.java +++ b/src/jd/plugins/decrypt/NetfolderIn.java @@ -33,7 +33,7 @@ public class NetfolderIn extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -64,7 +64,7 @@ public class NetfolderIn extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/NewsUrlDe.java b/src/jd/plugins/decrypt/NewsUrlDe.java index 71107be4c8..86d20458dc 100644 --- a/src/jd/plugins/decrypt/NewsUrlDe.java +++ b/src/jd/plugins/decrypt/NewsUrlDe.java @@ -32,7 +32,7 @@ public class NewsUrlDe extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -51,7 +51,7 @@ public class NewsUrlDe extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/NewzFindCom.java b/src/jd/plugins/decrypt/NewzFindCom.java index fa2ecda63c..2e50924c60 100644 --- a/src/jd/plugins/decrypt/NewzFindCom.java +++ b/src/jd/plugins/decrypt/NewzFindCom.java @@ -32,7 +32,7 @@ public class NewzFindCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -52,7 +52,7 @@ public class NewzFindCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/OneGabbaCom.java b/src/jd/plugins/decrypt/OneGabbaCom.java index c2018c97ee..d63fda98d1 100644 --- a/src/jd/plugins/decrypt/OneGabbaCom.java +++ b/src/jd/plugins/decrypt/OneGabbaCom.java @@ -30,7 +30,7 @@ public class OneGabbaCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -47,7 +47,7 @@ public class OneGabbaCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/OutlinkrCom.java b/src/jd/plugins/decrypt/OutlinkrCom.java index 58384a2220..32de31ed48 100644 --- a/src/jd/plugins/decrypt/OutlinkrCom.java +++ b/src/jd/plugins/decrypt/OutlinkrCom.java @@ -30,7 +30,7 @@ public class OutlinkrCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -53,7 +53,7 @@ public class OutlinkrCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/PaylesssoftsNet.java b/src/jd/plugins/decrypt/PaylesssoftsNet.java index a214ccd7c6..6b6cc2b71a 100644 --- a/src/jd/plugins/decrypt/PaylesssoftsNet.java +++ b/src/jd/plugins/decrypt/PaylesssoftsNet.java @@ -16,7 +16,7 @@ public class PaylesssoftsNet extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink parameter, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String param = parameter.toString(); @@ -48,7 +48,7 @@ public class PaylesssoftsNet extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/ProtectBoxIn.java b/src/jd/plugins/decrypt/ProtectBoxIn.java index 78214eb3b8..c2065a5b29 100644 --- a/src/jd/plugins/decrypt/ProtectBoxIn.java +++ b/src/jd/plugins/decrypt/ProtectBoxIn.java @@ -38,7 +38,7 @@ public class ProtectBoxIn extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -64,7 +64,7 @@ public class ProtectBoxIn extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/ProtectLinksCom.java b/src/jd/plugins/decrypt/ProtectLinksCom.java index 79417d484b..b637dcdb20 100644 --- a/src/jd/plugins/decrypt/ProtectLinksCom.java +++ b/src/jd/plugins/decrypt/ProtectLinksCom.java @@ -32,7 +32,7 @@ public class ProtectLinksCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -46,7 +46,7 @@ public class ProtectLinksCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/ProtectTehparadoxcom.java b/src/jd/plugins/decrypt/ProtectTehparadoxcom.java index cd8af301ab..93d6181740 100644 --- a/src/jd/plugins/decrypt/ProtectTehparadoxcom.java +++ b/src/jd/plugins/decrypt/ProtectTehparadoxcom.java @@ -31,7 +31,7 @@ public class ProtectTehparadoxcom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -44,7 +44,7 @@ public class ProtectTehparadoxcom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/ProtectorTO.java b/src/jd/plugins/decrypt/ProtectorTO.java index 53f0bb44fd..80cce2b7d2 100644 --- a/src/jd/plugins/decrypt/ProtectorTO.java +++ b/src/jd/plugins/decrypt/ProtectorTO.java @@ -44,7 +44,7 @@ public class ProtectorTO extends PluginForDecrypt { } @SuppressWarnings("unchecked") - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -138,7 +138,7 @@ public class ProtectorTO extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RaidrushOrg.java b/src/jd/plugins/decrypt/RaidrushOrg.java index c06377b529..3a65b717b2 100644 --- a/src/jd/plugins/decrypt/RaidrushOrg.java +++ b/src/jd/plugins/decrypt/RaidrushOrg.java @@ -33,7 +33,7 @@ public class RaidrushOrg extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -61,7 +61,7 @@ public class RaidrushOrg extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RapidFolderCom.java b/src/jd/plugins/decrypt/RapidFolderCom.java index 41cbd75ff8..5b8d8ca191 100644 --- a/src/jd/plugins/decrypt/RapidFolderCom.java +++ b/src/jd/plugins/decrypt/RapidFolderCom.java @@ -38,7 +38,7 @@ public class RapidFolderCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink cryptedLink, ProgressController progress) throws Exception { br.setFollowRedirects(false); ArrayList decryptedLinks = new ArrayList(); @@ -71,7 +71,7 @@ public class RapidFolderCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RapidLibrary.java b/src/jd/plugins/decrypt/RapidLibrary.java index 675d5ee29f..e96940f58d 100644 --- a/src/jd/plugins/decrypt/RapidLibrary.java +++ b/src/jd/plugins/decrypt/RapidLibrary.java @@ -33,7 +33,7 @@ public class RapidLibrary extends PluginForDecrypt { br.setCookiesExclusive(false); } - @Override + //@Override public ArrayList decryptIt(CryptedLink parameter, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); @@ -66,7 +66,7 @@ public class RapidLibrary extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RapidSpreadCom.java b/src/jd/plugins/decrypt/RapidSpreadCom.java index f7118b75b7..00e2dd9132 100644 --- a/src/jd/plugins/decrypt/RapidSpreadCom.java +++ b/src/jd/plugins/decrypt/RapidSpreadCom.java @@ -30,7 +30,7 @@ public class RapidSpreadCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -44,7 +44,7 @@ public class RapidSpreadCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Rapidlayerin.java b/src/jd/plugins/decrypt/Rapidlayerin.java index 86959989d0..97d94359bb 100644 --- a/src/jd/plugins/decrypt/Rapidlayerin.java +++ b/src/jd/plugins/decrypt/Rapidlayerin.java @@ -34,7 +34,7 @@ public class Rapidlayerin extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -56,7 +56,7 @@ public class Rapidlayerin extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RapidsafeDe.java b/src/jd/plugins/decrypt/RapidsafeDe.java index cafa5c6d3e..4eb297868d 100644 --- a/src/jd/plugins/decrypt/RapidsafeDe.java +++ b/src/jd/plugins/decrypt/RapidsafeDe.java @@ -39,7 +39,7 @@ public class RapidsafeDe extends PluginForDecrypt { } @SuppressWarnings("unchecked") - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -201,7 +201,7 @@ public class RapidsafeDe extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Rapidsafenet.java b/src/jd/plugins/decrypt/Rapidsafenet.java index cebbb0d212..32464483e3 100644 --- a/src/jd/plugins/decrypt/Rapidsafenet.java +++ b/src/jd/plugins/decrypt/Rapidsafenet.java @@ -31,7 +31,7 @@ public class Rapidsafenet extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -44,7 +44,7 @@ public class Rapidsafenet extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RapidshareComFolder.java b/src/jd/plugins/decrypt/RapidshareComFolder.java index e3eabb1ec9..cefa6e02a1 100644 --- a/src/jd/plugins/decrypt/RapidshareComFolder.java +++ b/src/jd/plugins/decrypt/RapidshareComFolder.java @@ -34,7 +34,7 @@ public class RapidshareComFolder extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { String parameter = param.toString(); @@ -67,7 +67,7 @@ public class RapidshareComFolder extends PluginForDecrypt { } } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RapidshareMu.java b/src/jd/plugins/decrypt/RapidshareMu.java index 874159ed5f..fb73639f63 100644 --- a/src/jd/plugins/decrypt/RapidshareMu.java +++ b/src/jd/plugins/decrypt/RapidshareMu.java @@ -30,7 +30,7 @@ public class RapidshareMu extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -45,7 +45,7 @@ public class RapidshareMu extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RappersIn.java b/src/jd/plugins/decrypt/RappersIn.java index faa127cef6..2d620a6810 100644 --- a/src/jd/plugins/decrypt/RappersIn.java +++ b/src/jd/plugins/decrypt/RappersIn.java @@ -39,7 +39,7 @@ public class RappersIn extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); @@ -96,7 +96,7 @@ public class RappersIn extends PluginForDecrypt { } } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RbaDe.java b/src/jd/plugins/decrypt/RbaDe.java index df4ed84fe1..37ee7195e6 100644 --- a/src/jd/plugins/decrypt/RbaDe.java +++ b/src/jd/plugins/decrypt/RbaDe.java @@ -40,7 +40,7 @@ public class RbaDe extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink cryptedLink, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); @@ -61,7 +61,7 @@ public class RbaDe extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Redirecter.java b/src/jd/plugins/decrypt/Redirecter.java index 8e0c48c5e9..367dc8ff0c 100644 --- a/src/jd/plugins/decrypt/Redirecter.java +++ b/src/jd/plugins/decrypt/Redirecter.java @@ -30,7 +30,7 @@ public class Redirecter extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -45,7 +45,7 @@ public class Redirecter extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RelinkItCom.java b/src/jd/plugins/decrypt/RelinkItCom.java index ee3b0e92ad..17dd9697c0 100644 --- a/src/jd/plugins/decrypt/RelinkItCom.java +++ b/src/jd/plugins/decrypt/RelinkItCom.java @@ -32,7 +32,7 @@ public class RelinkItCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -45,7 +45,7 @@ public class RelinkItCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RelinkUs.java b/src/jd/plugins/decrypt/RelinkUs.java index b9287b7019..732a919ecb 100644 --- a/src/jd/plugins/decrypt/RelinkUs.java +++ b/src/jd/plugins/decrypt/RelinkUs.java @@ -80,7 +80,7 @@ public class RelinkUs extends PluginForDecrypt { } } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { this.progress = progress; @@ -128,7 +128,7 @@ public class RelinkUs extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RelinkaNet.java b/src/jd/plugins/decrypt/RelinkaNet.java index 2dfd522f75..9740c8532e 100644 --- a/src/jd/plugins/decrypt/RelinkaNet.java +++ b/src/jd/plugins/decrypt/RelinkaNet.java @@ -32,7 +32,7 @@ public class RelinkaNet extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -53,7 +53,7 @@ public class RelinkaNet extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RemixShareComFolder.java b/src/jd/plugins/decrypt/RemixShareComFolder.java index 3aef151f0d..004c5b11f4 100644 --- a/src/jd/plugins/decrypt/RemixShareComFolder.java +++ b/src/jd/plugins/decrypt/RemixShareComFolder.java @@ -30,7 +30,7 @@ public class RemixShareComFolder extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -47,7 +47,7 @@ public class RemixShareComFolder extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Rlslog.java b/src/jd/plugins/decrypt/Rlslog.java index 74be5c1dd2..6db558d0a0 100644 --- a/src/jd/plugins/decrypt/Rlslog.java +++ b/src/jd/plugins/decrypt/Rlslog.java @@ -35,7 +35,7 @@ public class Rlslog extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); Vector passwords; @@ -83,7 +83,7 @@ public class Rlslog extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RnB4Uin.java b/src/jd/plugins/decrypt/RnB4Uin.java index 2cc310729c..757a88641e 100644 --- a/src/jd/plugins/decrypt/RnB4Uin.java +++ b/src/jd/plugins/decrypt/RnB4Uin.java @@ -30,7 +30,7 @@ public class RnB4Uin extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -41,7 +41,7 @@ public class RnB4Uin extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RockHouseIn.java b/src/jd/plugins/decrypt/RockHouseIn.java index 8a40e96363..a61441c4ac 100644 --- a/src/jd/plugins/decrypt/RockHouseIn.java +++ b/src/jd/plugins/decrypt/RockHouseIn.java @@ -31,7 +31,7 @@ public class RockHouseIn extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -48,7 +48,7 @@ public class RockHouseIn extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RomHustlerNet.java b/src/jd/plugins/decrypt/RomHustlerNet.java index 63a7e301a8..0061522eaa 100644 --- a/src/jd/plugins/decrypt/RomHustlerNet.java +++ b/src/jd/plugins/decrypt/RomHustlerNet.java @@ -31,7 +31,7 @@ public class RomHustlerNet extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -43,7 +43,7 @@ public class RomHustlerNet extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RomsZopharNet.java b/src/jd/plugins/decrypt/RomsZopharNet.java index fa7c6f9ecf..654d090aaf 100644 --- a/src/jd/plugins/decrypt/RomsZopharNet.java +++ b/src/jd/plugins/decrypt/RomsZopharNet.java @@ -36,7 +36,7 @@ public class RomsZopharNet extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -54,7 +54,7 @@ public class RomsZopharNet extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RomscentralCom.java b/src/jd/plugins/decrypt/RomscentralCom.java index ae698a1775..641b625e83 100644 --- a/src/jd/plugins/decrypt/RomscentralCom.java +++ b/src/jd/plugins/decrypt/RomscentralCom.java @@ -38,7 +38,7 @@ public class RomscentralCom extends PluginForDecrypt { this.setAcceptOnlyURIs(false); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -66,7 +66,7 @@ public class RomscentralCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Rs43Com.java b/src/jd/plugins/decrypt/Rs43Com.java index 95005c4573..4ea57fd37d 100644 --- a/src/jd/plugins/decrypt/Rs43Com.java +++ b/src/jd/plugins/decrypt/Rs43Com.java @@ -31,7 +31,7 @@ public class Rs43Com extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -48,7 +48,7 @@ public class Rs43Com extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RsHoerbuchin.java b/src/jd/plugins/decrypt/RsHoerbuchin.java index 9fa17726c0..5570a90f71 100644 --- a/src/jd/plugins/decrypt/RsHoerbuchin.java +++ b/src/jd/plugins/decrypt/RsHoerbuchin.java @@ -33,7 +33,7 @@ public class RsHoerbuchin extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -52,7 +52,7 @@ public class RsHoerbuchin extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RsLayerCom.java b/src/jd/plugins/decrypt/RsLayerCom.java index 504e7791dc..65a026d95e 100644 --- a/src/jd/plugins/decrypt/RsLayerCom.java +++ b/src/jd/plugins/decrypt/RsLayerCom.java @@ -58,7 +58,7 @@ public class RsLayerCom extends PluginForDecrypt { return false; } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -124,7 +124,7 @@ public class RsLayerCom extends PluginForDecrypt { } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RsMonkeyCom.java b/src/jd/plugins/decrypt/RsMonkeyCom.java index e2d91b72e3..d9ab87c481 100644 --- a/src/jd/plugins/decrypt/RsMonkeyCom.java +++ b/src/jd/plugins/decrypt/RsMonkeyCom.java @@ -30,7 +30,7 @@ public class RsMonkeyCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -41,7 +41,7 @@ public class RsMonkeyCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RsXXXBlog.java b/src/jd/plugins/decrypt/RsXXXBlog.java index 2b7b5c8b78..aa4a8e03cb 100644 --- a/src/jd/plugins/decrypt/RsXXXBlog.java +++ b/src/jd/plugins/decrypt/RsXXXBlog.java @@ -30,7 +30,7 @@ public class RsXXXBlog extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -46,7 +46,7 @@ public class RsXXXBlog extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/RsprotectCom.java b/src/jd/plugins/decrypt/RsprotectCom.java index 2a133a0c12..c4af8bfd29 100644 --- a/src/jd/plugins/decrypt/RsprotectCom.java +++ b/src/jd/plugins/decrypt/RsprotectCom.java @@ -31,7 +31,7 @@ public class RsprotectCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -44,7 +44,7 @@ public class RsprotectCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Rsprotectfreehosterch.java b/src/jd/plugins/decrypt/Rsprotectfreehosterch.java index dbb97a798e..7fdb22a9bd 100644 --- a/src/jd/plugins/decrypt/Rsprotectfreehosterch.java +++ b/src/jd/plugins/decrypt/Rsprotectfreehosterch.java @@ -31,7 +31,7 @@ public class Rsprotectfreehosterch extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -44,7 +44,7 @@ public class Rsprotectfreehosterch extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/SAUGUS.java b/src/jd/plugins/decrypt/SAUGUS.java index e4884c97ab..ba2fcfb650 100644 --- a/src/jd/plugins/decrypt/SAUGUS.java +++ b/src/jd/plugins/decrypt/SAUGUS.java @@ -34,7 +34,7 @@ public class SAUGUS extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -87,7 +87,7 @@ public class SAUGUS extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/SaveRaidrushWs.java b/src/jd/plugins/decrypt/SaveRaidrushWs.java index b7406fc792..9de488333d 100644 --- a/src/jd/plugins/decrypt/SaveRaidrushWs.java +++ b/src/jd/plugins/decrypt/SaveRaidrushWs.java @@ -30,7 +30,7 @@ public class SaveRaidrushWs extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -46,7 +46,7 @@ public class SaveRaidrushWs extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/SavefileComProject.java b/src/jd/plugins/decrypt/SavefileComProject.java index c0e5e03600..befcc48e6b 100644 --- a/src/jd/plugins/decrypt/SavefileComProject.java +++ b/src/jd/plugins/decrypt/SavefileComProject.java @@ -29,7 +29,7 @@ public class SavefileComProject extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -41,7 +41,7 @@ public class SavefileComProject extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/ScumIn.java b/src/jd/plugins/decrypt/ScumIn.java index 37df9eb78f..cda1a03f7d 100644 --- a/src/jd/plugins/decrypt/ScumIn.java +++ b/src/jd/plugins/decrypt/ScumIn.java @@ -32,7 +32,7 @@ public class ScumIn extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -57,7 +57,7 @@ public class ScumIn extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/SdxCc.java b/src/jd/plugins/decrypt/SdxCc.java index 7404d2fbb8..8d7dc3463c 100644 --- a/src/jd/plugins/decrypt/SdxCc.java +++ b/src/jd/plugins/decrypt/SdxCc.java @@ -42,7 +42,7 @@ public class SdxCc extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink cryptedLink, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String url = cryptedLink.getCryptedUrl(); @@ -69,7 +69,7 @@ public class SdxCc extends PluginForDecrypt { return decryptedLinks.size() > 0 ? decryptedLinks : null; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/SealedIn.java b/src/jd/plugins/decrypt/SealedIn.java index 709af0be9e..0a03706909 100644 --- a/src/jd/plugins/decrypt/SealedIn.java +++ b/src/jd/plugins/decrypt/SealedIn.java @@ -38,7 +38,7 @@ public class SealedIn extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -210,7 +210,7 @@ public class SealedIn extends PluginForDecrypt { } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Secured.java b/src/jd/plugins/decrypt/Secured.java index 9d0d9cd243..196d8ce52a 100644 --- a/src/jd/plugins/decrypt/Secured.java +++ b/src/jd/plugins/decrypt/Secured.java @@ -262,7 +262,7 @@ public class Secured extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -306,12 +306,12 @@ public class Secured extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getCoder() { return "olimex, JD-Team"; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Serienjunkies.java b/src/jd/plugins/decrypt/Serienjunkies.java index 078cfde5d2..35dd23f347 100644 --- a/src/jd/plugins/decrypt/Serienjunkies.java +++ b/src/jd/plugins/decrypt/Serienjunkies.java @@ -166,7 +166,7 @@ public class Serienjunkies extends PluginForDecrypt { return ret; } - @Override + //@Override public synchronized boolean canHandle(String data) { boolean cat = false; if (data == null) return false; @@ -679,12 +679,12 @@ public class Serienjunkies extends PluginForDecrypt { return dlink; } - @Override + //@Override public String cutMatches(String data) { return data.replaceAll("(?i)http://[\\w\\.]*?(serienjunkies\\.org|85\\.17\\.177\\.195|serienjunki\\.es).*", "--CUT--"); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { Browser.setRequestIntervalLimitGlobal("serienjunkies.org", 400); Browser.setRequestIntervalLimitGlobal("download.serienjunkies.org", 400); @@ -695,7 +695,7 @@ public class Serienjunkies extends PluginForDecrypt { ar = new GuiRunnable>() { - @Override + //@Override public ArrayList runSave() { SerienjunkiesSJTable sjt = new SerienjunkiesSJTable(SimpleGUI.CURRENTGUI, ar2); @@ -932,7 +932,7 @@ public class Serienjunkies extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public CryptedLink[] getDecryptableLinks(String data) { String[] links = new Regex(data, "http://[\\w\\.]*?(serienjunkies\\.org|85\\.17\\.177\\.195|serienjunki\\.es)[^\"]*", Pattern.CASE_INSENSITIVE).getColumn(-1); ArrayList ret = new ArrayList(); @@ -1023,7 +1023,7 @@ public class Serienjunkies extends PluginForDecrypt { return useScat[0]; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } @@ -1044,7 +1044,7 @@ public class Serienjunkies extends PluginForDecrypt { new GuiRunnable() { private static final long serialVersionUID = 8726498576488124702L; - @Override + //@Override public Object runSave() { new Dialog(SimpleGUI.CURRENTGUI) { @@ -1067,7 +1067,7 @@ public class Serienjunkies extends PluginForDecrypt { this.var = var; } - @Override + //@Override public String toString() { return name; } @@ -1160,7 +1160,7 @@ public class Serienjunkies extends PluginForDecrypt { this.cryptedLink = cryptedLink; } - @Override + //@Override public void run() { try { LinkStatus linkStatus = downloadLink.getLinkStatus(); @@ -1402,7 +1402,7 @@ class SerienjunkiesSJTable extends JDialog { countdownThread = new Thread() { - @Override + //@Override public void run() { while (!isVisible() && isDisplayable()) { @@ -1475,12 +1475,12 @@ class SerienjunkiesTM extends AbstractTableModel { return m_columns.length; } - @Override + //@Override public String getColumnName(int column) { return m_columns[column].m_title; } - @Override + //@Override public boolean isCellEditable(int nRow, int nCol) { return false; } diff --git a/src/jd/plugins/decrypt/Sexuriacom.java b/src/jd/plugins/decrypt/Sexuriacom.java index c1c90879a8..b31296f847 100644 --- a/src/jd/plugins/decrypt/Sexuriacom.java +++ b/src/jd/plugins/decrypt/Sexuriacom.java @@ -40,7 +40,7 @@ public class Sexuriacom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -78,7 +78,7 @@ public class Sexuriacom extends PluginForDecrypt { return null; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/ShareBaseToFolder.java b/src/jd/plugins/decrypt/ShareBaseToFolder.java index d36e16a37b..c2096b6924 100644 --- a/src/jd/plugins/decrypt/ShareBaseToFolder.java +++ b/src/jd/plugins/decrypt/ShareBaseToFolder.java @@ -30,7 +30,7 @@ public class ShareBaseToFolder extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { String url = param.getCryptedUrl(); ArrayList decryptedLinks = new ArrayList(); @@ -43,7 +43,7 @@ public class ShareBaseToFolder extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/ShareProtect.java b/src/jd/plugins/decrypt/ShareProtect.java index 76b9fe2449..34451b9f28 100644 --- a/src/jd/plugins/decrypt/ShareProtect.java +++ b/src/jd/plugins/decrypt/ShareProtect.java @@ -33,7 +33,7 @@ public class ShareProtect extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -63,7 +63,7 @@ public class ShareProtect extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/SharebankWs.java b/src/jd/plugins/decrypt/SharebankWs.java index f3d53065bd..526ef58017 100644 --- a/src/jd/plugins/decrypt/SharebankWs.java +++ b/src/jd/plugins/decrypt/SharebankWs.java @@ -36,7 +36,7 @@ public class SharebankWs extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String url = param.toString(); @@ -79,7 +79,7 @@ public class SharebankWs extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/SpiegelDe.java b/src/jd/plugins/decrypt/SpiegelDe.java index 4e1022bfd4..769c6e6e69 100644 --- a/src/jd/plugins/decrypt/SpiegelDe.java +++ b/src/jd/plugins/decrypt/SpiegelDe.java @@ -64,7 +64,7 @@ public class SpiegelDe extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink cryptedLink, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); if (new Regex(cryptedLink.getCryptedUrl(), PATTERN_SUPPORTED_VIDEO).matches()) { @@ -151,7 +151,7 @@ public class SpiegelDe extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/SprezerCom.java b/src/jd/plugins/decrypt/SprezerCom.java index c9ecc385dc..e794600210 100644 --- a/src/jd/plugins/decrypt/SprezerCom.java +++ b/src/jd/plugins/decrypt/SprezerCom.java @@ -30,7 +30,7 @@ public class SprezerCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -46,7 +46,7 @@ public class SprezerCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Stealth.java b/src/jd/plugins/decrypt/Stealth.java index 79c7cd6b7d..b0e9ce789d 100644 --- a/src/jd/plugins/decrypt/Stealth.java +++ b/src/jd/plugins/decrypt/Stealth.java @@ -43,7 +43,7 @@ public class Stealth extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception, DecrypterException { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -150,7 +150,7 @@ public class Stealth extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/SuperUploaderNet.java b/src/jd/plugins/decrypt/SuperUploaderNet.java index ceef96646c..f6abc6e32e 100644 --- a/src/jd/plugins/decrypt/SuperUploaderNet.java +++ b/src/jd/plugins/decrypt/SuperUploaderNet.java @@ -30,7 +30,7 @@ public class SuperUploaderNet extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -49,7 +49,7 @@ public class SuperUploaderNet extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/TechnorockerInfo.java b/src/jd/plugins/decrypt/TechnorockerInfo.java index 3110bf5798..8b00f2757b 100644 --- a/src/jd/plugins/decrypt/TechnorockerInfo.java +++ b/src/jd/plugins/decrypt/TechnorockerInfo.java @@ -29,7 +29,7 @@ public class TechnorockerInfo extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -44,7 +44,7 @@ public class TechnorockerInfo extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/UCMS.java b/src/jd/plugins/decrypt/UCMS.java index e4bb60cf09..9a66bd5cf7 100644 --- a/src/jd/plugins/decrypt/UCMS.java +++ b/src/jd/plugins/decrypt/UCMS.java @@ -44,7 +44,7 @@ public class UCMS extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -157,7 +157,7 @@ public class UCMS extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/URLCash.java b/src/jd/plugins/decrypt/URLCash.java index b30f121af0..b266d163ad 100644 --- a/src/jd/plugins/decrypt/URLCash.java +++ b/src/jd/plugins/decrypt/URLCash.java @@ -30,7 +30,7 @@ public class URLCash extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -44,7 +44,7 @@ public class URLCash extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/UUCannaTo.java b/src/jd/plugins/decrypt/UUCannaTo.java index fdc020ae89..7a4bd7e660 100644 --- a/src/jd/plugins/decrypt/UUCannaTo.java +++ b/src/jd/plugins/decrypt/UUCannaTo.java @@ -34,7 +34,7 @@ public class UUCannaTo extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -67,7 +67,7 @@ public class UUCannaTo extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/UpPicoasisNet.java b/src/jd/plugins/decrypt/UpPicoasisNet.java index b6f6927f4c..b02f22b40c 100644 --- a/src/jd/plugins/decrypt/UpPicoasisNet.java +++ b/src/jd/plugins/decrypt/UpPicoasisNet.java @@ -31,7 +31,7 @@ public class UpPicoasisNet extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -43,7 +43,7 @@ public class UpPicoasisNet extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/UploadJockeycom.java b/src/jd/plugins/decrypt/UploadJockeycom.java index b50d851582..edc43d76cb 100644 --- a/src/jd/plugins/decrypt/UploadJockeycom.java +++ b/src/jd/plugins/decrypt/UploadJockeycom.java @@ -31,7 +31,7 @@ public class UploadJockeycom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -48,7 +48,7 @@ public class UploadJockeycom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/UrlShieldnet.java b/src/jd/plugins/decrypt/UrlShieldnet.java index 452bf88782..e9f90533aa 100644 --- a/src/jd/plugins/decrypt/UrlShieldnet.java +++ b/src/jd/plugins/decrypt/UrlShieldnet.java @@ -42,7 +42,7 @@ public class UrlShieldnet extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -119,7 +119,7 @@ public class UrlShieldnet extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/UserCashCom.java b/src/jd/plugins/decrypt/UserCashCom.java index 2e46906143..28081d62f9 100644 --- a/src/jd/plugins/decrypt/UserCashCom.java +++ b/src/jd/plugins/decrypt/UserCashCom.java @@ -15,7 +15,7 @@ public class UserCashCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -26,7 +26,7 @@ public class UserCashCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/VetaXin.java b/src/jd/plugins/decrypt/VetaXin.java index a8f131cb8d..f7deab2a90 100644 --- a/src/jd/plugins/decrypt/VetaXin.java +++ b/src/jd/plugins/decrypt/VetaXin.java @@ -37,7 +37,7 @@ public class VetaXin extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -89,7 +89,7 @@ public class VetaXin extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Web06de.java b/src/jd/plugins/decrypt/Web06de.java index 31afeb4562..520bce0a4c 100644 --- a/src/jd/plugins/decrypt/Web06de.java +++ b/src/jd/plugins/decrypt/Web06de.java @@ -31,7 +31,7 @@ public class Web06de extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -44,7 +44,7 @@ public class Web06de extends PluginForDecrypt { return null; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Wiireloaded.java b/src/jd/plugins/decrypt/Wiireloaded.java index bfeb894c6e..29d68e4136 100644 --- a/src/jd/plugins/decrypt/Wiireloaded.java +++ b/src/jd/plugins/decrypt/Wiireloaded.java @@ -35,7 +35,7 @@ public class Wiireloaded extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { int submitvalue = getPluginConfig().getIntegerProperty("WIIReloaded_SubmitValue", 5); String parameter = param.toString(); @@ -138,7 +138,7 @@ public class Wiireloaded extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Woireless6xTo.java b/src/jd/plugins/decrypt/Woireless6xTo.java index 9eb8be7396..c0a17b8ea9 100644 --- a/src/jd/plugins/decrypt/Woireless6xTo.java +++ b/src/jd/plugins/decrypt/Woireless6xTo.java @@ -31,7 +31,7 @@ public class Woireless6xTo extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -53,7 +53,7 @@ public class Woireless6xTo extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Wordpress.java b/src/jd/plugins/decrypt/Wordpress.java index f67610fab5..61692b42fe 100644 --- a/src/jd/plugins/decrypt/Wordpress.java +++ b/src/jd/plugins/decrypt/Wordpress.java @@ -49,7 +49,7 @@ public class Wordpress extends PluginForDecrypt { defaultPasswords.put("blogload.org", new String[] { "blogload.org" }); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { // System.out.println(param); ArrayList decryptedLinks = new ArrayList(); @@ -86,7 +86,7 @@ public class Wordpress extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/WrzutaPl.java b/src/jd/plugins/decrypt/WrzutaPl.java index 5eaa564106..5ee8733aae 100644 --- a/src/jd/plugins/decrypt/WrzutaPl.java +++ b/src/jd/plugins/decrypt/WrzutaPl.java @@ -33,7 +33,7 @@ public class WrzutaPl extends PluginForDecrypt { // TODO Auto-generated constructor stub } - @Override + //@Override public ArrayList decryptIt(CryptedLink parameter, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); br.setCookiesExclusive(true); @@ -67,7 +67,7 @@ public class WrzutaPl extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Xailicom.java b/src/jd/plugins/decrypt/Xailicom.java index 4284b75000..cbc1c17407 100644 --- a/src/jd/plugins/decrypt/Xailicom.java +++ b/src/jd/plugins/decrypt/Xailicom.java @@ -31,7 +31,7 @@ public class Xailicom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -49,7 +49,7 @@ public class Xailicom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/XenonLinkNet.java b/src/jd/plugins/decrypt/XenonLinkNet.java index 34f7a9bee1..a087c0f186 100644 --- a/src/jd/plugins/decrypt/XenonLinkNet.java +++ b/src/jd/plugins/decrypt/XenonLinkNet.java @@ -33,7 +33,7 @@ public class XenonLinkNet extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); @@ -48,7 +48,7 @@ public class XenonLinkNet extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/XinkIt.java b/src/jd/plugins/decrypt/XinkIt.java index a6d2caf09f..347246ae0a 100644 --- a/src/jd/plugins/decrypt/XinkIt.java +++ b/src/jd/plugins/decrypt/XinkIt.java @@ -35,7 +35,7 @@ public class XinkIt extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -75,7 +75,7 @@ public class XinkIt extends PluginForDecrypt { } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/XliceNet.java b/src/jd/plugins/decrypt/XliceNet.java index 3fdd40e468..71db681f60 100644 --- a/src/jd/plugins/decrypt/XliceNet.java +++ b/src/jd/plugins/decrypt/XliceNet.java @@ -30,7 +30,7 @@ public class XliceNet extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -50,7 +50,7 @@ public class XliceNet extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/XrlUs.java b/src/jd/plugins/decrypt/XrlUs.java index 6dc5fb800f..f24dc9f28b 100644 --- a/src/jd/plugins/decrypt/XrlUs.java +++ b/src/jd/plugins/decrypt/XrlUs.java @@ -30,7 +30,7 @@ public class XrlUs extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -52,7 +52,7 @@ public class XrlUs extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/XupInFolder.java b/src/jd/plugins/decrypt/XupInFolder.java index f87c2a1caa..ab569d9cff 100644 --- a/src/jd/plugins/decrypt/XupInFolder.java +++ b/src/jd/plugins/decrypt/XupInFolder.java @@ -30,7 +30,7 @@ public class XupInFolder extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -46,7 +46,7 @@ public class XupInFolder extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/YouPornCom.java b/src/jd/plugins/decrypt/YouPornCom.java index 34917be4ff..711be98193 100644 --- a/src/jd/plugins/decrypt/YouPornCom.java +++ b/src/jd/plugins/decrypt/YouPornCom.java @@ -30,7 +30,7 @@ public class YouPornCom extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -49,7 +49,7 @@ public class YouPornCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/YouTubeCom.java b/src/jd/plugins/decrypt/YouTubeCom.java index 173b6b6f34..d02e012822 100644 --- a/src/jd/plugins/decrypt/YouTubeCom.java +++ b/src/jd/plugins/decrypt/YouTubeCom.java @@ -73,7 +73,7 @@ public class YouTubeCom extends PluginForDecrypt { } } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList possibleconverts = new ArrayList(); ArrayList decryptedLinks = new ArrayList(); @@ -179,7 +179,7 @@ public class YouTubeCom extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/YourFilesBizFolder.java b/src/jd/plugins/decrypt/YourFilesBizFolder.java index 375414db89..5da92c1f75 100644 --- a/src/jd/plugins/decrypt/YourFilesBizFolder.java +++ b/src/jd/plugins/decrypt/YourFilesBizFolder.java @@ -30,7 +30,7 @@ public class YourFilesBizFolder extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -52,7 +52,7 @@ public class YourFilesBizFolder extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/Zero10Us.java b/src/jd/plugins/decrypt/Zero10Us.java index e51aa8b21f..a8935ed277 100644 --- a/src/jd/plugins/decrypt/Zero10Us.java +++ b/src/jd/plugins/decrypt/Zero10Us.java @@ -32,7 +32,7 @@ public class Zero10Us extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -57,7 +57,7 @@ public class Zero10Us extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/ZeroSecWs.java b/src/jd/plugins/decrypt/ZeroSecWs.java index ff4524b681..6992f5a81f 100644 --- a/src/jd/plugins/decrypt/ZeroSecWs.java +++ b/src/jd/plugins/decrypt/ZeroSecWs.java @@ -19,7 +19,7 @@ public class ZeroSecWs extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); Vector passwords; @@ -68,7 +68,7 @@ public class ZeroSecWs extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/decrypt/rapidsharknet.java b/src/jd/plugins/decrypt/rapidsharknet.java index 7be8fbdb14..be07ee3e5f 100644 --- a/src/jd/plugins/decrypt/rapidsharknet.java +++ b/src/jd/plugins/decrypt/rapidsharknet.java @@ -31,7 +31,7 @@ public class rapidsharknet extends PluginForDecrypt { super(wrapper); } - @Override + //@Override public ArrayList decryptIt(CryptedLink param, ProgressController progress) throws Exception { ArrayList decryptedLinks = new ArrayList(); String parameter = param.toString(); @@ -46,7 +46,7 @@ public class rapidsharknet extends PluginForDecrypt { return decryptedLinks; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/download/RAFDownload.java b/src/jd/plugins/download/RAFDownload.java index 120b7f386f..1444b9ed21 100644 --- a/src/jd/plugins/download/RAFDownload.java +++ b/src/jd/plugins/download/RAFDownload.java @@ -63,7 +63,7 @@ public class RAFDownload extends DownloadInterface { start(); } - @Override + //@Override public void run() { ChunkBuffer buf; while (!isInterrupted() || bufferList.size() > 0) { @@ -146,7 +146,7 @@ public class RAFDownload extends DownloadInterface { } - @Override + //@Override protected void onChunksReady() { logger.finer("onCHunksReady"); if (writer != null) { @@ -279,7 +279,7 @@ public class RAFDownload extends DownloadInterface { } - @Override + //@Override protected void setupChunks() throws Exception { try { @@ -399,7 +399,7 @@ public class RAFDownload extends DownloadInterface { } - @Override + //@Override protected boolean writeChunkBytes(Chunk chunk) { if (writeType) { ByteBuffer buffer = ByteBuffer.allocateDirect(chunk.buffer.limit()); diff --git a/src/jd/plugins/host/AddatHu.java b/src/jd/plugins/host/AddatHu.java index f18c768c44..266be0b42e 100644 --- a/src/jd/plugins/host/AddatHu.java +++ b/src/jd/plugins/host/AddatHu.java @@ -30,17 +30,17 @@ public class AddatHu extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://www.addat.hu/"; } - @Override + //@Override public String getCoder() { return "TnS"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException { br.setCookiesExclusive(true); br.clearCookies(getHost()); @@ -52,12 +52,12 @@ public class AddatHu extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { br.setFollowRedirects(true); getFileInformation(downloadLink); @@ -65,30 +65,30 @@ public class AddatHu extends PluginForHost { br.openDownload(downloadLink, link, true, 1).startDownload(); } - @Override + //@Override public int getTimegapBetweenConnections() { return 500; } - @Override + //@Override public int getMaxConnections() { return 1; } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/AdriveCom.java b/src/jd/plugins/host/AdriveCom.java index 9ad2088632..2e67295fc7 100644 --- a/src/jd/plugins/host/AdriveCom.java +++ b/src/jd/plugins/host/AdriveCom.java @@ -34,12 +34,12 @@ public class AdriveCom extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://www.adrive.com/terms"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, InterruptedException, PluginException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -62,12 +62,12 @@ public class AdriveCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { /* Nochmals das File überprüfen */ getFileInformation(downloadLink); @@ -92,20 +92,20 @@ public class AdriveCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/ArchivTo.java b/src/jd/plugins/host/ArchivTo.java index 5d0f557214..dfcb3fafb3 100644 --- a/src/jd/plugins/host/ArchivTo.java +++ b/src/jd/plugins/host/ArchivTo.java @@ -35,13 +35,13 @@ public class ArchivTo extends PluginForHost { // TODO Auto-generated constructor stub } - @Override + //@Override public String getAGBLink() { return "http://archiv.to/?Module=Policy"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException { try { br.setFollowRedirects(true); @@ -60,13 +60,13 @@ public class ArchivTo extends PluginForHost { return false; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { LinkStatus linkStatus = downloadLink.getLinkStatus(); br.setCookiesExclusive(true); @@ -83,20 +83,20 @@ public class ArchivTo extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/AxiFileCom.java b/src/jd/plugins/host/AxiFileCom.java index 485f855c60..af7b4169d4 100644 --- a/src/jd/plugins/host/AxiFileCom.java +++ b/src/jd/plugins/host/AxiFileCom.java @@ -39,12 +39,12 @@ public class AxiFileCom extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://www.axifile.com/terms.php"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws PluginException, IOException { br.setCookiesExclusive(true); br.getPage(downloadLink.getDownloadURL()); @@ -62,12 +62,12 @@ public class AxiFileCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); br.setFollowRedirects(true); @@ -111,20 +111,20 @@ public class AxiFileCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/BadongoCom.java b/src/jd/plugins/host/BadongoCom.java index ba4ca94573..db10d27ea2 100644 --- a/src/jd/plugins/host/BadongoCom.java +++ b/src/jd/plugins/host/BadongoCom.java @@ -40,12 +40,12 @@ public class BadongoCom extends PluginForHost { this.enablePremium("http://www.badongo.com/compare"); } - @Override + //@Override public String getAGBLink() { return "http://www.badongo.com/toc/"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws PluginException, IOException { br.setCookiesExclusive(true); br.setCookie("http://www.badongo.com", "badongoL", "de"); @@ -73,12 +73,12 @@ public class BadongoCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handlePremium(DownloadLink parameter, Account account) throws Exception { getFileInformation(parameter); login(account); @@ -105,7 +105,7 @@ public class BadongoCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { /* Nochmals das File überprüfen */ String link = null; @@ -158,16 +158,16 @@ public class BadongoCom extends PluginForHost { if (br.containsHTML("Du hast Deine Download Quote überschritten")) throw new PluginException(LinkStatus.ERROR_IP_BLOCKED, 60 * 60 * 1000l); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } @@ -194,7 +194,7 @@ public class BadongoCom extends PluginForHost { } } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); try { @@ -215,7 +215,7 @@ public class BadongoCom extends PluginForHost { return ai; } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/BagrujCz.java b/src/jd/plugins/host/BagrujCz.java index 6f39857e9a..32019e26be 100644 --- a/src/jd/plugins/host/BagrujCz.java +++ b/src/jd/plugins/host/BagrujCz.java @@ -37,7 +37,7 @@ public class BagrujCz extends PluginForHost { super(wrapper); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); br.setFollowRedirects(false); @@ -90,17 +90,17 @@ public class BagrujCz extends PluginForHost { } } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public String getAGBLink() { return "http://bagruj.cz/tos.html"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { this.setBrowserExclusive(); br.setCookie("http://bagruj.cz/", "lang", "english"); @@ -114,20 +114,20 @@ public class BagrujCz extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { } diff --git a/src/jd/plugins/host/BluehostTo.java b/src/jd/plugins/host/BluehostTo.java index 6d727581b8..81a0117dd1 100644 --- a/src/jd/plugins/host/BluehostTo.java +++ b/src/jd/plugins/host/BluehostTo.java @@ -51,7 +51,7 @@ public class BluehostTo extends PluginForHost { } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); try { @@ -68,7 +68,7 @@ public class BluehostTo extends PluginForHost { return ai; } - @Override + //@Override public void handlePremium(DownloadLink downloadLink, Account account) throws Exception { this.setBrowserExclusive(); getFileInformation(downloadLink); @@ -93,7 +93,7 @@ public class BluehostTo extends PluginForHost { dl.startDownload(); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { this.setBrowserExclusive(); getFileInformation(downloadLink); @@ -113,12 +113,12 @@ public class BluehostTo extends PluginForHost { dl.startDownload(); } - @Override + //@Override public String getAGBLink() { return "http://bluehost.to/agb.php"; } - @Override + //@Override public boolean checkLinks(DownloadLink[] urls) { if (urls == null) return false; @@ -159,7 +159,7 @@ public class BluehostTo extends PluginForHost { return true; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { correctUrl(downloadLink); // dateiname, dateihash, dateisize, dateidownloads, zeit bis HH @@ -179,25 +179,25 @@ public class BluehostTo extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/ClipfishDe.java b/src/jd/plugins/host/ClipfishDe.java index 8df7bdf1ce..c3d9dbb2e2 100644 --- a/src/jd/plugins/host/ClipfishDe.java +++ b/src/jd/plugins/host/ClipfishDe.java @@ -35,12 +35,12 @@ public class ClipfishDe extends PluginForHost { private static final String AGB_LINK = "http://www.clipfish.de/agb/"; - @Override + //@Override public String getAGBLink() { return AGB_LINK; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) { try { URLConnectionAdapter urlConnection = br.openGetConnection(downloadLink.getDownloadURL()); @@ -54,21 +54,21 @@ public class ClipfishDe extends PluginForHost { } } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { LinkStatus linkStatus = downloadLink.getLinkStatus(); /* Nochmals das File überprüfen */ @@ -99,12 +99,12 @@ public class ClipfishDe extends PluginForHost { } } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/DataHu.java b/src/jd/plugins/host/DataHu.java index d6ca4d66d7..cf97c1574a 100644 --- a/src/jd/plugins/host/DataHu.java +++ b/src/jd/plugins/host/DataHu.java @@ -37,12 +37,12 @@ public class DataHu extends PluginForHost { this.enablePremium("http://data.hu/premium.php"); } - @Override + //@Override public String getAGBLink() { return "http://data.hu/adatvedelem.php"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException { br.setCookiesExclusive(true); br.clearCookies(getHost()); @@ -54,7 +54,7 @@ public class DataHu extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } @@ -78,7 +78,7 @@ public class DataHu extends PluginForHost { return false; } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); this.setBrowserExclusive(); @@ -103,7 +103,7 @@ public class DataHu extends PluginForHost { return ai; } - @Override + //@Override public void handlePremium(DownloadLink downloadLink, Account account) throws Exception { getFileInformation(downloadLink); login(account); @@ -115,7 +115,7 @@ public class DataHu extends PluginForHost { dl.startDownload(); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { br.setFollowRedirects(true); getFileInformation(downloadLink); @@ -130,30 +130,30 @@ public class DataHu extends PluginForHost { } - @Override + //@Override public int getTimegapBetweenConnections() { return 500; } - @Override + //@Override public int getMaxConnections() { return 1; } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/Dataupde.java b/src/jd/plugins/host/Dataupde.java index 83a0e7c499..dd3571708f 100644 --- a/src/jd/plugins/host/Dataupde.java +++ b/src/jd/plugins/host/Dataupde.java @@ -33,12 +33,12 @@ public class Dataupde extends PluginForHost { private String downloadurl; - @Override + //@Override public String getAGBLink() { return "http://www.dataup.de/agb"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) { try { downloadurl = downloadLink.getDownloadURL(); @@ -58,13 +58,13 @@ public class Dataupde extends PluginForHost { return false; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { LinkStatus linkStatus = downloadLink.getLinkStatus(); @@ -100,21 +100,21 @@ public class Dataupde extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/DepositFiles.java b/src/jd/plugins/host/DepositFiles.java index c41ed43eb3..c306507de0 100644 --- a/src/jd/plugins/host/DepositFiles.java +++ b/src/jd/plugins/host/DepositFiles.java @@ -56,7 +56,7 @@ public class DepositFiles extends PluginForHost { this.enablePremium("http://depositfiles.com/signup.php?ref=down1"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { setBrowserExclusive(); getFileInformation(downloadLink); @@ -126,7 +126,7 @@ public class DepositFiles extends PluginForHost { return false; } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); setBrowserExclusive(); @@ -162,7 +162,7 @@ public class DepositFiles extends PluginForHost { return ai; } - @Override + //@Override public void handlePremium(DownloadLink downloadLink, Account account) throws Exception { getFileInformation(downloadLink); login(account); @@ -202,7 +202,7 @@ public class DepositFiles extends PluginForHost { dl.startDownload(); } - @Override + //@Override public String getAGBLink() { return "http://depositfiles.com/en/agreem.html"; } @@ -211,7 +211,7 @@ public class DepositFiles extends PluginForHost { downloadLink.setUrlDownload(downloadLink.getDownloadURL().replaceAll("\\.com(/.*?)?/files", ".com/de/files")); } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { setBrowserExclusive(); correctUrl(downloadLink); @@ -235,35 +235,35 @@ public class DepositFiles extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public int getMaxSimultanPremiumDownloadNum() { return simultanpremium; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public int getTimegapBetweenConnections() { return 800; } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/DlFreeFr.java b/src/jd/plugins/host/DlFreeFr.java index 33e1f56415..1539dc9609 100644 --- a/src/jd/plugins/host/DlFreeFr.java +++ b/src/jd/plugins/host/DlFreeFr.java @@ -18,12 +18,12 @@ public class DlFreeFr extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://dl.free.fr/"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { this.setBrowserExclusive(); br.setFollowRedirects(true); @@ -44,12 +44,12 @@ public class DlFreeFr extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { /* Nochmals das File überprüfen */ getFileInformation(downloadLink); @@ -66,20 +66,20 @@ public class DlFreeFr extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/DumpRu.java b/src/jd/plugins/host/DumpRu.java index df82d9e6ad..642db9c703 100644 --- a/src/jd/plugins/host/DumpRu.java +++ b/src/jd/plugins/host/DumpRu.java @@ -29,12 +29,12 @@ public class DumpRu extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://dump.ru/pages/about/"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) { try { setBrowserExclusive(); @@ -67,12 +67,12 @@ public class DumpRu extends PluginForHost { return false; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { if (!getFileInformation(downloadLink)) { throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND); } br.submitForm(br.getForm(1)); @@ -81,21 +81,21 @@ public class DumpRu extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { /* TODO: Wert nachprüfen */ return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/EasyShareCom.java b/src/jd/plugins/host/EasyShareCom.java index 3ae9d511b0..f58fbc698b 100644 --- a/src/jd/plugins/host/EasyShareCom.java +++ b/src/jd/plugins/host/EasyShareCom.java @@ -28,7 +28,7 @@ public class EasyShareCom extends PluginForHost { /* brauche neuen prem account zum einbauen und testen */ } - @Override + //@Override public String getAGBLink() { return "http://www.easy-share.com/tos.html"; } @@ -63,7 +63,7 @@ public class EasyShareCom extends PluginForHost { return premstatus.getExpires(); } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); try { @@ -83,7 +83,7 @@ public class EasyShareCom extends PluginForHost { return ai; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { this.setBrowserExclusive(); br.setCookie("http://www.easy-share.com", "language", "en"); @@ -98,12 +98,12 @@ public class EasyShareCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { /* Nochmals das File überprüfen */ getFileInformation(downloadLink); @@ -141,7 +141,7 @@ public class EasyShareCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public void handlePremium(DownloadLink downloadLink, Account account) throws Exception { getFileInformation(downloadLink); login(account); @@ -151,20 +151,20 @@ public class EasyShareCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { } } diff --git a/src/jd/plugins/host/EgoshareCom.java b/src/jd/plugins/host/EgoshareCom.java index fce3561dae..d0397da42d 100644 --- a/src/jd/plugins/host/EgoshareCom.java +++ b/src/jd/plugins/host/EgoshareCom.java @@ -27,12 +27,12 @@ public class EgoshareCom extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://www.egoshare.com/faq.php"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -44,12 +44,12 @@ public class EgoshareCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { url = downloadLink.getDownloadURL(); /* Nochmals das File überprüfen */ @@ -112,20 +112,20 @@ public class EgoshareCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/EnteruploadCom.java b/src/jd/plugins/host/EnteruploadCom.java index 6840938470..2df58fbf2f 100644 --- a/src/jd/plugins/host/EnteruploadCom.java +++ b/src/jd/plugins/host/EnteruploadCom.java @@ -37,7 +37,7 @@ public class EnteruploadCom extends PluginForHost { super(wrapper); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); br.setFollowRedirects(false); @@ -90,7 +90,7 @@ public class EnteruploadCom extends PluginForHost { } } - @Override + //@Override // TODO: AntiCaptcha Method would allow simultanous connections // if user is quick; he can enter captchas one-by-one and then server allow // him simulatanous downloads @@ -99,12 +99,12 @@ public class EnteruploadCom extends PluginForHost { return 10; } - @Override + //@Override public String getAGBLink() { return "http://www.enterupload.com/tos.html"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { this.setBrowserExclusive(); br.setCookie("http://www.enterupload.com/", "lang", "english"); @@ -118,20 +118,20 @@ public class EnteruploadCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { } diff --git a/src/jd/plugins/host/ExtraShareUs.java b/src/jd/plugins/host/ExtraShareUs.java index 31fde50053..3bcbad6612 100644 --- a/src/jd/plugins/host/ExtraShareUs.java +++ b/src/jd/plugins/host/ExtraShareUs.java @@ -30,17 +30,17 @@ public class ExtraShareUs extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://www.extrashare.us/rules.php"; } - @Override + //@Override public String getCoder() { return "TnS"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException { br.setCookiesExclusive(true); br.clearCookies(getHost()); @@ -52,12 +52,12 @@ public class ExtraShareUs extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { br.setFollowRedirects(true); getFileInformation(downloadLink); @@ -65,30 +65,30 @@ public class ExtraShareUs extends PluginForHost { br.openDownload(downloadLink, link, true, 1).startDownload(); } - @Override + //@Override public int getTimegapBetweenConnections() { return 500; } - @Override + //@Override public int getMaxConnections() { return 1; } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/FastShareorg.java b/src/jd/plugins/host/FastShareorg.java index 2a6a880334..34778d2e75 100644 --- a/src/jd/plugins/host/FastShareorg.java +++ b/src/jd/plugins/host/FastShareorg.java @@ -34,12 +34,12 @@ public class FastShareorg extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://www.fastshare.org/discl.php"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) { try { br.setCookiesExclusive(true); @@ -64,13 +64,13 @@ public class FastShareorg extends PluginForHost { return false; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { LinkStatus linkStatus = downloadLink.getLinkStatus(); @@ -104,20 +104,20 @@ public class FastShareorg extends PluginForHost { } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/FileBaseTo.java b/src/jd/plugins/host/FileBaseTo.java index 7b99d76581..4e48daec92 100644 --- a/src/jd/plugins/host/FileBaseTo.java +++ b/src/jd/plugins/host/FileBaseTo.java @@ -35,12 +35,12 @@ public class FileBaseTo extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://filebase.to/tos/"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { // br.setCookiesExclusive(true); br.clearCookies(getHost()); @@ -55,12 +55,12 @@ public class FileBaseTo extends PluginForHost { } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); String formact = downloadLink.getDownloadURL(); @@ -79,20 +79,20 @@ public class FileBaseTo extends PluginForHost { br.openDownload(downloadLink, dlAction, "wait=" + Encoding.urlEncode("Download - " + downloadLink.getName())).startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/FileFactory.java b/src/jd/plugins/host/FileFactory.java index 90a24b963f..5fb7a3fcc3 100644 --- a/src/jd/plugins/host/FileFactory.java +++ b/src/jd/plugins/host/FileFactory.java @@ -63,12 +63,12 @@ public class FileFactory extends PluginForHost { this.enablePremium("http://www.filefactory.com/info/premium.php"); } - @Override + //@Override public int getTimegapBetweenConnections() { return 200; } - @Override + //@Override public void handleFree(DownloadLink parameter) throws Exception { try { handleFree0(parameter); @@ -179,12 +179,12 @@ public class FileFactory extends PluginForHost { } - @Override + //@Override public int getMaxRetries() { return 20; } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); Browser br = new Browser(); @@ -234,7 +234,7 @@ public class FileFactory extends PluginForHost { return ai; } - @Override + //@Override public void handlePremium(DownloadLink downloadLink, Account account) throws Exception { String user = account.getUser(); String pass = account.getPass(); @@ -285,12 +285,12 @@ public class FileFactory extends PluginForHost { return; } - @Override + //@Override public String getAGBLink() { return "http://www.filefactory.com/info/terms.php"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws Exception, PluginException { downloadLink.setUrlDownload(downloadLink.getDownloadURL().replaceAll(".com//", ".com/")); downloadLink.setUrlDownload(downloadLink.getDownloadURL().replaceAll("http://filefactory", "http://www.filefactory")); @@ -333,29 +333,29 @@ public class FileFactory extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void init() { } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { } diff --git a/src/jd/plugins/host/FileFactoryPl.java b/src/jd/plugins/host/FileFactoryPl.java index fad2efa67f..a6dcea51c8 100644 --- a/src/jd/plugins/host/FileFactoryPl.java +++ b/src/jd/plugins/host/FileFactoryPl.java @@ -34,12 +34,12 @@ public class FileFactoryPl extends PluginForHost { this.setStartIntervall(5000l); } - @Override + //@Override public String getAGBLink() { return "http://www.filefactory.pl/tos.html"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, InterruptedException, PluginException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -52,12 +52,12 @@ public class FileFactoryPl extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); String linkurl = br.getRegex("DOWNLOAD FILE").getMatch(0); @@ -70,20 +70,20 @@ public class FileFactoryPl extends PluginForHost { } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/FileFrontCom.java b/src/jd/plugins/host/FileFrontCom.java index 05d7399053..a590df3fa0 100644 --- a/src/jd/plugins/host/FileFrontCom.java +++ b/src/jd/plugins/host/FileFrontCom.java @@ -32,12 +32,12 @@ public class FileFrontCom extends PluginForHost { //this.setStartIntervall(5000l); } - @Override + //@Override public String getAGBLink() { return "http://aup.legal.filefront.com/"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, InterruptedException, PluginException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -52,12 +52,12 @@ public class FileFrontCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); String nextpageurl = br.getRegex("POST\\sDOWNLOAD\\sPAGE.\\s-->\\s+\\s+]*>").matches(); } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); this.setBrowserExclusive(); @@ -88,7 +88,7 @@ public class GigaSizeCom extends PluginForHost { return ai; } - @Override + //@Override public void handlePremium(DownloadLink parameter, Account account) throws Exception { getFileInformation(parameter); login(account); @@ -116,7 +116,7 @@ public class GigaSizeCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public void handleFree(DownloadLink parameter) throws Exception { getFileInformation(parameter); handleFree0(parameter); @@ -144,12 +144,12 @@ public class GigaSizeCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public String getAGBLink() { return AGB_LINK; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -164,35 +164,35 @@ public class GigaSizeCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public int getMaxSimultanPremiumDownloadNum() { return simultanpremium; } - @Override + //@Override public void reset() { } - @Override + //@Override public int getTimegapBetweenConnections() { return 800; } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/GoogleGroups.java b/src/jd/plugins/host/GoogleGroups.java index 16380e7eea..33406fc3e2 100644 --- a/src/jd/plugins/host/GoogleGroups.java +++ b/src/jd/plugins/host/GoogleGroups.java @@ -36,12 +36,12 @@ public class GoogleGroups extends PluginForHost { // TODO Auto-generated constructor stub } - @Override + //@Override public String getAGBLink() { return "http://groups.google.com/intl/de/googlegroups/terms_of_service3.html"; } - @Override + //@Override public boolean checkLinks(DownloadLink[] urls) { br.setCookiesExclusive(true); br.clearCookies(getHost()); @@ -87,18 +87,18 @@ public class GoogleGroups extends PluginForHost { return true; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException { checkLinks(new DownloadLink[] { downloadLink }); return downloadLink.isAvailable(); } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception, PluginException { if (!getFileInformation(downloadLink)) throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND); // .googlegroups.com/web/ @@ -110,20 +110,20 @@ public class GoogleGroups extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/HTTPAllgemein.java b/src/jd/plugins/host/HTTPAllgemein.java index 04d3f5976b..88b4b060b5 100644 --- a/src/jd/plugins/host/HTTPAllgemein.java +++ b/src/jd/plugins/host/HTTPAllgemein.java @@ -37,12 +37,12 @@ public class HTTPAllgemein extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return ""; } - @Override + //@Override public String getFileInformationString(DownloadLink parameter) { return "(" + contentType + ")" + parameter.getName(); } @@ -70,7 +70,7 @@ public class HTTPAllgemein extends PluginForHost { return null; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws PluginException { this.setBrowserExclusive(); downloadLink.setUrlDownload(downloadLink.getDownloadURL().replaceAll("httpviajd://", "http://")); @@ -123,12 +123,12 @@ public class HTTPAllgemein extends PluginForHost { throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND); } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { /* Nochmals das File überprüfen */ getFileInformation(downloadLink); @@ -160,23 +160,23 @@ public class HTTPAllgemein extends PluginForHost { } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { link.setProperty("nochunkload", false); link.setProperty("nochunk", false); link.setProperty("basicauth", null); } - @Override + //@Override public void resetPluginGlobals() { } diff --git a/src/jd/plugins/host/HostPlikCom.java b/src/jd/plugins/host/HostPlikCom.java index beb6774c9e..e69cf27cd1 100644 --- a/src/jd/plugins/host/HostPlikCom.java +++ b/src/jd/plugins/host/HostPlikCom.java @@ -34,12 +34,12 @@ public class HostPlikCom extends PluginForHost { this.setStartIntervall(5000l); } - @Override + //@Override public String getAGBLink() { return "http://www.hostplik.com/index.php?page=tos"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, InterruptedException, PluginException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -52,12 +52,12 @@ public class HostPlikCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); String linkurl = br.getRegex("onClick=\"window.location=\\\\'(.*?)\\\\'\">';").getMatch(0); @@ -69,20 +69,20 @@ public class HostPlikCom extends PluginForHost { } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/HotFileCom.java b/src/jd/plugins/host/HotFileCom.java index 352b4bc1b8..8e8757ed0c 100644 --- a/src/jd/plugins/host/HotFileCom.java +++ b/src/jd/plugins/host/HotFileCom.java @@ -31,12 +31,12 @@ public class HotFileCom extends PluginForHost { // TODO Auto-generated constructor stub } - @Override + //@Override public String getAGBLink() { return "http://hotfile.com/terms-of-service.html"; } - @Override + //@Override public boolean getFileInformation(DownloadLink parameter) throws Exception { this.setBrowserExclusive(); br.getPage(parameter.getDownloadURL()); @@ -48,7 +48,7 @@ public class HotFileCom extends PluginForHost { return true; } - @Override + //@Override public void handleFree(DownloadLink link) throws Exception { getFileInformation(link); if (br.containsHTML("You are currently downloading")) throw new PluginException(LinkStatus.ERROR_IP_BLOCKED, 5 * 60 * 1000l); @@ -68,18 +68,18 @@ public class HotFileCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public void reset() { // TODO Auto-generated method stub } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/IFileIt.java b/src/jd/plugins/host/IFileIt.java index bdb1f34cf7..c03ee74f1e 100644 --- a/src/jd/plugins/host/IFileIt.java +++ b/src/jd/plugins/host/IFileIt.java @@ -18,12 +18,12 @@ public class IFileIt extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://ifile.it/tos"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { this.setBrowserExclusive(); br.setFollowRedirects(true); @@ -37,12 +37,12 @@ public class IFileIt extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception, PluginException { /* Nochmals das File überprüfen */ getFileInformation(downloadLink); @@ -87,20 +87,20 @@ public class IFileIt extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { link.setProperty("directLink", null); } diff --git a/src/jd/plugins/host/IfolderRu.java b/src/jd/plugins/host/IfolderRu.java index 43f1101173..1a10d2d824 100644 --- a/src/jd/plugins/host/IfolderRu.java +++ b/src/jd/plugins/host/IfolderRu.java @@ -37,12 +37,12 @@ public class IfolderRu extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return ("http://ifolder.ru/agreement"); } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws PluginException, IOException, InterruptedException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -57,7 +57,7 @@ public class IfolderRu extends PluginForHost { return true; } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { boolean do_download = false; getFileInformation(downloadLink); @@ -118,22 +118,22 @@ public class IfolderRu extends PluginForHost { throw new PluginException(LinkStatus.ERROR_CAPTCHA); } - @Override + //@Override public void reset() { } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { /* Tested up to 10 parallel downloads */ return 10; } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { } diff --git a/src/jd/plugins/host/ImageFap.java b/src/jd/plugins/host/ImageFap.java index c3d99d2780..9c06c3a2ce 100644 --- a/src/jd/plugins/host/ImageFap.java +++ b/src/jd/plugins/host/ImageFap.java @@ -70,12 +70,12 @@ public class ImageFap extends PluginForHost { return null; } - @Override + //@Override public String getAGBLink() { return "http://imagefap.com/faq.php"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) { try { br.getPage(downloadLink.getDownloadURL()); @@ -102,12 +102,12 @@ public class ImageFap extends PluginForHost { return false; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { br.setFollowRedirects(true); br.getPage(downloadLink.getDownloadURL()); @@ -133,20 +133,20 @@ public class ImageFap extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 10; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/JamendoCom.java b/src/jd/plugins/host/JamendoCom.java index 8eeacdbe59..cf601c2abd 100644 --- a/src/jd/plugins/host/JamendoCom.java +++ b/src/jd/plugins/host/JamendoCom.java @@ -23,12 +23,12 @@ public class JamendoCom extends PluginForHost { setConfigElements(); } - @Override + //@Override public String getAGBLink() { return "http://www.jamendo.com/en/cgu_user"; } - @Override + //@Override public boolean getFileInformation(DownloadLink parameter) throws Exception { this.setBrowserExclusive(); String TrackDownloadID = new Regex(parameter.getDownloadURL(), "/download/track/(\\d+)").getMatch(0); @@ -67,7 +67,7 @@ public class JamendoCom extends PluginForHost { throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND); } - @Override + //@Override public void handleFree(DownloadLink link) throws Exception { getFileInformation(link); String dlurl = null; @@ -133,17 +133,17 @@ public class JamendoCom extends PluginForHost { return dlurl; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public void reset() { } @@ -151,7 +151,7 @@ public class JamendoCom extends PluginForHost { config.addEntry(new ConfigEntry(ConfigContainer.TYPE_CHECKBOX, getPluginConfig(), PREFER_HIGHQUALITY, JDLocale.L("plugins.hoster.jamendo", "Prefer High Quality Download")).setDefaultValue(true)); } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/KewlshareCom.java b/src/jd/plugins/host/KewlshareCom.java index 768008b2d9..bfa5f77f16 100644 --- a/src/jd/plugins/host/KewlshareCom.java +++ b/src/jd/plugins/host/KewlshareCom.java @@ -16,12 +16,12 @@ public class KewlshareCom extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://kewlshare.com/tos"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws PluginException, IOException { setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -33,12 +33,12 @@ public class KewlshareCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); Form form = br.getForm(1); @@ -57,26 +57,26 @@ public class KewlshareCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public int getTimegapBetweenConnections() { return 2500; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/LeteckaPostaCz.java b/src/jd/plugins/host/LeteckaPostaCz.java index b6548ef1f5..3068e342a9 100644 --- a/src/jd/plugins/host/LeteckaPostaCz.java +++ b/src/jd/plugins/host/LeteckaPostaCz.java @@ -34,12 +34,12 @@ public class LeteckaPostaCz extends PluginForHost { //this.setStartIntervall(5000l); } - @Override + //@Override public String getAGBLink() { return "http://leteckaposta.cz/tos"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, InterruptedException, PluginException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -52,12 +52,12 @@ public class LeteckaPostaCz extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); String linkurl = br.getRegex("\\s+

" : "") + downloadLink.getName() + " (" + Formatter.formatReadable(downloadLink.getDownloadSize()) + ")"; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } @@ -307,30 +307,30 @@ public class MegaroticCom extends PluginForHost { } } - @Override + //@Override public void handleFree(DownloadLink parameter) throws Exception { getFileInformation(parameter); handleFree0(parameter); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public void reset() { captchaPost = null; captchaURL = null; fields = null; } - @Override + //@Override public int getMaxSimultanPremiumDownloadNum() { return simultanpremium; } - @Override + //@Override public void resetPluginGlobals() { } @@ -339,7 +339,7 @@ public class MegaroticCom extends PluginForHost { config.addEntry(new ConfigEntry(ConfigContainer.TYPE_COMBOBOX_INDEX, JDUtilities.getConfiguration(), MU_PARAM_PORT, ports, JDLocale.L("plugins.host.megaupload.ports", "Use this port:")).setDefaultValue("80")); } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/MegasharesCom.java b/src/jd/plugins/host/MegasharesCom.java index 81012f1042..4f8d109466 100644 --- a/src/jd/plugins/host/MegasharesCom.java +++ b/src/jd/plugins/host/MegasharesCom.java @@ -62,7 +62,7 @@ public class MegasharesCom extends PluginForHost { } } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); try { @@ -96,7 +96,7 @@ public class MegasharesCom extends PluginForHost { br.setFollowRedirects(tmp); } - @Override + //@Override public void handlePremium(DownloadLink downloadLink, Account account) throws Exception { if (!getFileInformation(downloadLink)) { throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND); } login(account); @@ -115,7 +115,7 @@ public class MegasharesCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { if (!getFileInformation(downloadLink)) { throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND); } loadpage(downloadLink); @@ -219,12 +219,12 @@ public class MegasharesCom extends PluginForHost { return true; } - @Override + //@Override public String getAGBLink() { return AGB_LINK; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException { setBrowserExclusive(); loadpage(downloadLink); @@ -251,31 +251,31 @@ public class MegasharesCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public int getTimegapBetweenConnections() { return 2000; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/Megauploadcom.java b/src/jd/plugins/host/Megauploadcom.java index 0e93fdfbf1..8311758d95 100644 --- a/src/jd/plugins/host/Megauploadcom.java +++ b/src/jd/plugins/host/Megauploadcom.java @@ -82,7 +82,7 @@ public class Megauploadcom extends PluginForHost { return true; } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); this.setBrowserExclusive(); @@ -118,7 +118,7 @@ public class Megauploadcom extends PluginForHost { return Request.parseQuery(link.getDownloadURL()).get("d").toUpperCase(); } - @Override + //@Override public void handlePremium(DownloadLink link, Account account) throws Exception { getFileInformation(link); br.setDebug(true); @@ -208,7 +208,7 @@ public class Megauploadcom extends PluginForHost { } } - @Override + //@Override public String getAGBLink() { return "http://megaupload.com/terms/"; } @@ -232,7 +232,7 @@ public class Megauploadcom extends PluginForHost { if (user == null) throw new PluginException(LinkStatus.ERROR_PREMIUM, LinkStatus.VALUE_ID_PREMIUM_DISABLE); } - @Override + //@Override public boolean checkLinks(DownloadLink[] urls) { if (urls == null) return false; @@ -321,14 +321,14 @@ public class Megauploadcom extends PluginForHost { return true; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { downloadLink.setAvailable(this.checkLinks(new DownloadLink[] { downloadLink })); if (!downloadLink.isAvailable()) throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND); return downloadLink.isAvailable(); } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } @@ -513,7 +513,7 @@ public class Megauploadcom extends PluginForHost { br.getHeaders().setDominant(false); } - @Override + //@Override public void handleFree(DownloadLink parameter) throws Exception { user = null; br.setCookie("http://megaupload.com", "l", "en"); @@ -521,25 +521,25 @@ public class Megauploadcom extends PluginForHost { handleFree0(parameter, null); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return FREE; } - @Override + //@Override public void reset() { } - @Override + //@Override public int getMaxSimultanPremiumDownloadNum() { return simultanpremium; } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { } diff --git a/src/jd/plugins/host/MeinUpload.java b/src/jd/plugins/host/MeinUpload.java index d7bb904a37..faa3d8dd59 100644 --- a/src/jd/plugins/host/MeinUpload.java +++ b/src/jd/plugins/host/MeinUpload.java @@ -45,7 +45,7 @@ public class MeinUpload extends PluginForHost { enablePremium("http://meinupload.com/register.php?g=2"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); if (br.getRedirectLocation() != null) { @@ -55,7 +55,7 @@ public class MeinUpload extends PluginForHost { handleFree0(downloadLink); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } @@ -134,7 +134,7 @@ public class MeinUpload extends PluginForHost { return true; } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); try { @@ -161,12 +161,12 @@ public class MeinUpload extends PluginForHost { return ai; } - @Override + //@Override public int getMaxSimultanPremiumDownloadNum() { return simultanpremium; } - @Override + //@Override public void handlePremium(DownloadLink downloadLink, Account account) throws Exception { getFileInformation(downloadLink); login(account); @@ -195,12 +195,12 @@ public class MeinUpload extends PluginForHost { dl.startDownload(); } - @Override + //@Override public String getAGBLink() { return AGB_LINK; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { this.setBrowserExclusive(); br.clearCookies("mein-upload.com"); @@ -218,20 +218,20 @@ public class MeinUpload extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/MilleDriveCom.java b/src/jd/plugins/host/MilleDriveCom.java index 648e9477da..52a3b3746c 100644 --- a/src/jd/plugins/host/MilleDriveCom.java +++ b/src/jd/plugins/host/MilleDriveCom.java @@ -33,12 +33,12 @@ public class MilleDriveCom extends PluginForHost { // this.setStartIntervall(5000l); } - @Override + //@Override public String getAGBLink() { return "http://milledrive.com/terms_of_service/"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, InterruptedException, PluginException { this.setBrowserExclusive(); br.setFollowRedirects(true); @@ -61,12 +61,12 @@ public class MilleDriveCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); String directlink = br.getRegex("file:\"(.*?)\"").getMatch(0); @@ -97,20 +97,20 @@ public class MilleDriveCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/Moosharenet.java b/src/jd/plugins/host/Moosharenet.java index 977405f594..d6de8924cd 100644 --- a/src/jd/plugins/host/Moosharenet.java +++ b/src/jd/plugins/host/Moosharenet.java @@ -43,7 +43,7 @@ public class Moosharenet extends PluginForHost { enablePremium("http://mooshare.net/?section=becomemember"); } - @Override + //@Override public String getAGBLink() { return "http://mooshare.net/?section=faq"; } @@ -59,7 +59,7 @@ public class Moosharenet extends PluginForHost { } } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); try { @@ -90,7 +90,7 @@ public class Moosharenet extends PluginForHost { return ai; } - @Override + //@Override public void handlePremium(DownloadLink downloadLink, Account account) throws Exception { getFileInformation(downloadLink); login(account); @@ -114,7 +114,7 @@ public class Moosharenet extends PluginForHost { dl.startDownload(); } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws Exception { this.setBrowserExclusive(); br.setFollowRedirects(false); @@ -137,12 +137,12 @@ public class Moosharenet extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { /* Nochmals das File überprüfen */ getFileInformation(downloadLink); @@ -180,21 +180,21 @@ public class Moosharenet extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 5; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { } diff --git a/src/jd/plugins/host/MySpaceCom.java b/src/jd/plugins/host/MySpaceCom.java index 8d1c25b360..5dee23e0fd 100644 --- a/src/jd/plugins/host/MySpaceCom.java +++ b/src/jd/plugins/host/MySpaceCom.java @@ -37,12 +37,12 @@ public class MySpaceCom extends PluginForHost { return link.getDownloadURL().replaceAll("myspace://", ""); } - @Override + //@Override public String getAGBLink() { return AGB_LINK; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException { URLConnectionAdapter urlConnection = br.openGetConnection(getDownloadUrl(downloadLink)); if (!urlConnection.isOK()) { @@ -55,21 +55,21 @@ public class MySpaceCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { /* Nochmals das File Überprüfen */ if (!getFileInformation(downloadLink)) { throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND); } @@ -79,12 +79,12 @@ public class MySpaceCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/MyVideo.java b/src/jd/plugins/host/MyVideo.java index 24972de02a..544aee0e39 100644 --- a/src/jd/plugins/host/MyVideo.java +++ b/src/jd/plugins/host/MyVideo.java @@ -33,25 +33,25 @@ public class MyVideo extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return AGB; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws Exception { URLConnectionAdapter con = br.openGetConnection(downloadLink.getDownloadURL()); if (con.getResponseCode() == 200) { return true; } return false; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { if (!getFileInformation(downloadLink)) { throw new PluginException(LinkStatus.ERROR_FATAL); } @@ -70,21 +70,21 @@ public class MyVideo extends PluginForHost { } } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { /* TODO: Wert nachprüfen */ return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/Netloadin.java b/src/jd/plugins/host/Netloadin.java index 9fcd40cbed..e39e0b90fe 100644 --- a/src/jd/plugins/host/Netloadin.java +++ b/src/jd/plugins/host/Netloadin.java @@ -73,7 +73,7 @@ public class Netloadin extends PluginForHost { this.enablePremium("http://netload.in/index.php?refer_id=134847&id=39"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { br.setDebug(true); @@ -276,7 +276,7 @@ br.forceDebug(true); } } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); try { @@ -302,12 +302,12 @@ br.forceDebug(true); return ai; } - @Override + //@Override public int getTimegapBetweenConnections() { return 800; } - @Override + //@Override public void handlePremium(DownloadLink downloadLink, Account account) throws Exception { getFileInformation(downloadLink); @@ -374,7 +374,7 @@ br.forceDebug(true); } } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { link.setProperty("nochunk", false); } @@ -384,12 +384,12 @@ br.forceDebug(true); if (br.containsHTML(FILE_DAMAGED)) throw new PluginException(LinkStatus.ERROR_TEMPORARILY_UNAVAILABLE, JDLocale.L("plugins.hoster.netloadin.errors.fileondmgserver", "File on damaged server"), 20 * 60 * 1000l); } - @Override + //@Override public String getAGBLink() { return AGB_LINK; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws PluginException { try { @@ -437,26 +437,26 @@ br.forceDebug(true); throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND); } - @Override + //@Override public String getFileInformationString(DownloadLink downloadLink) { return downloadLink.getName() + " (" + fileStatusText + ")"; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } diff --git a/src/jd/plugins/host/Odsiebiecom.java b/src/jd/plugins/host/Odsiebiecom.java index f11115fc5b..38e5541b6e 100644 --- a/src/jd/plugins/host/Odsiebiecom.java +++ b/src/jd/plugins/host/Odsiebiecom.java @@ -36,12 +36,12 @@ public class Odsiebiecom extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://odsiebie.com/tresc/faq.html"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { this.setBrowserExclusive(); br.setFollowRedirects(true); @@ -56,12 +56,12 @@ public class Odsiebiecom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { /* Nochmals das File überprüfen */ String finalfn = downloadLink.getName(); @@ -140,20 +140,20 @@ public class Odsiebiecom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { } diff --git a/src/jd/plugins/host/OnlyFourFilesCom.java b/src/jd/plugins/host/OnlyFourFilesCom.java index e4fe9cbf06..5adcbf3562 100644 --- a/src/jd/plugins/host/OnlyFourFilesCom.java +++ b/src/jd/plugins/host/OnlyFourFilesCom.java @@ -37,7 +37,7 @@ public class OnlyFourFilesCom extends PluginForHost { super(wrapper); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); br.setFollowRedirects(false); @@ -85,7 +85,7 @@ public class OnlyFourFilesCom extends PluginForHost { } } - @Override + //@Override // TODO: AntiCaptcha Method would allow simultanous connections // if user is quick; he can enter captchas one-by-one and then server allow // him simulatanous downloads @@ -94,12 +94,12 @@ public class OnlyFourFilesCom extends PluginForHost { return 10; } - @Override + //@Override public String getAGBLink() { return "http://only4files.com/tos.html"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -112,20 +112,20 @@ public class OnlyFourFilesCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { } diff --git a/src/jd/plugins/host/PixelhitCom.java b/src/jd/plugins/host/PixelhitCom.java index 7c2719116d..43faadd22f 100644 --- a/src/jd/plugins/host/PixelhitCom.java +++ b/src/jd/plugins/host/PixelhitCom.java @@ -37,7 +37,7 @@ public class PixelhitCom extends PluginForHost { super(wrapper); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); br.setFollowRedirects(false); @@ -86,7 +86,7 @@ public class PixelhitCom extends PluginForHost { } } - @Override + //@Override // TODO: AntiCaptcha Method would allow simultanous connections // if user is quick; he can enter captchas one-by-one and then server allow // him simulatanous downloads @@ -95,12 +95,12 @@ public class PixelhitCom extends PluginForHost { return 10; } - @Override + //@Override public String getAGBLink() { return "http://www.pixelhit.com/tos.html"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { this.setBrowserExclusive(); br.setCookie("http://www.pixelhit.com/", "lang", "english"); @@ -114,20 +114,20 @@ public class PixelhitCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { } diff --git a/src/jd/plugins/host/PliczekNet.java b/src/jd/plugins/host/PliczekNet.java index 6962b6f678..7cf6858ece 100644 --- a/src/jd/plugins/host/PliczekNet.java +++ b/src/jd/plugins/host/PliczekNet.java @@ -34,12 +34,12 @@ public class PliczekNet extends PluginForHost { this.setStartIntervall(5000l); } - @Override + //@Override public String getAGBLink() { return "http://www.pliczek.net/index.php?p=terms"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, InterruptedException, PluginException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -52,12 +52,12 @@ public class PliczekNet extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); String linkurl = br.getRegex("]*>\\s*\\s*\\s*

]*>Pobierz plikZareje")) return false; return * true; } * - * @Override public AccountInfo fetchAccountInfo(Account account) + * //@Override public AccountInfo fetchAccountInfo(Account account) * throws Exception { AccountInfo ai = new AccountInfo(this, account); try { * login(account); } catch (PluginException e) { ai.setValid(false); return * ai; } if (!isPremium()) { @@ -140,10 +140,10 @@ public class UpMusicIn extends PluginForHost { * ai.setValidUntil(Regex.getMilliSeconds(expires, "mm/dd/yy", Locale.UK)); * return ai; } * - * @Override public int getMaxSimultanPremiumDownloadNum() { return + * //@Override public int getMaxSimultanPremiumDownloadNum() { return * simultanpremium; } * - * @Override public void handlePremium(DownloadLink downloadLink, Account + * //@Override public void handlePremium(DownloadLink downloadLink, Account * account) throws Exception { getFileInformation(downloadLink); * login(account); if (!this.isPremium()) { simultanpremium = 10; * handleFree0(downloadLink); return; } else { if (simultanpremium + 1 > 20) @@ -155,12 +155,12 @@ public class UpMusicIn extends PluginForHost { * uncomment when they find a better // way to force wait time dl = * br.openDownload(downloadLink, linkurl); dl.startDownload(); } */ - @Override + //@Override public String getAGBLink() { return "http://www.upmusic.in/tos.html"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { this.setBrowserExclusive(); br.setFollowRedirects(true); @@ -177,20 +177,20 @@ public class UpMusicIn extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/UploadBoxCom.java b/src/jd/plugins/host/UploadBoxCom.java index 5cb6c55af0..ccf6d15054 100644 --- a/src/jd/plugins/host/UploadBoxCom.java +++ b/src/jd/plugins/host/UploadBoxCom.java @@ -33,12 +33,12 @@ public class UploadBoxCom extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://uploadbox.com/en/terms/"; } - @Override + //@Override public boolean getFileInformation(DownloadLink parameter) throws Exception { this.setBrowserExclusive(); String id = new Regex(parameter.getDownloadURL(), "files/([0-9a-zA-Z]+)").getMatch(0); @@ -53,7 +53,7 @@ public class UploadBoxCom extends PluginForHost { return true; } - @Override + //@Override public void handleFree(DownloadLink link) throws Exception { getFileInformation(link); Form form = br.getForm(1); @@ -81,21 +81,21 @@ public class UploadBoxCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public void reset() { } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 1; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { } diff --git a/src/jd/plugins/host/UploadDriveCom.java b/src/jd/plugins/host/UploadDriveCom.java index fa0e00450b..8b6eab974f 100644 --- a/src/jd/plugins/host/UploadDriveCom.java +++ b/src/jd/plugins/host/UploadDriveCom.java @@ -33,12 +33,12 @@ public class UploadDriveCom extends PluginForHost { this.setStartIntervall(5000l); } - @Override + //@Override public String getAGBLink() { return "http://www.upload-drive.com/terms.html"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, InterruptedException, PluginException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -54,12 +54,12 @@ public class UploadDriveCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); String linkurl = br.getRegex("

]*>\\s*(.*?)").getMatch(0); @@ -52,7 +52,7 @@ public class UploaderPl extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 10; } @@ -87,7 +87,7 @@ public class UploaderPl extends PluginForHost { return true; } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); try { @@ -113,12 +113,12 @@ public class UploaderPl extends PluginForHost { return ai; } - @Override + //@Override public int getMaxSimultanPremiumDownloadNum() { return simultanpremium; } - @Override + //@Override public void handlePremium(DownloadLink downloadLink, Account account) throws Exception { getFileInformation(downloadLink); login(account); @@ -142,12 +142,12 @@ public class UploaderPl extends PluginForHost { dl.startDownload(); } - @Override + //@Override public String getAGBLink() { return "http://uploader.pl/rules.php"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { this.setBrowserExclusive(); br.getPage("http://uploader.pl/en"); @@ -161,20 +161,20 @@ public class UploaderPl extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/UploadingCom.java b/src/jd/plugins/host/UploadingCom.java index 7662d5e552..a293e2fd80 100644 --- a/src/jd/plugins/host/UploadingCom.java +++ b/src/jd/plugins/host/UploadingCom.java @@ -24,7 +24,7 @@ public class UploadingCom extends PluginForHost { this.enablePremium("http://www.uploading.com/premium/"); } - @Override + //@Override public String getAGBLink() { return "http://uploading.com/terms/"; } @@ -45,7 +45,7 @@ public class UploadingCom extends PluginForHost { if (br.getCookie("http://www.uploading.com/", "ulogin") == null || br.getCookie("http://www.uploading.com/", "upass") == null) throw new PluginException(LinkStatus.ERROR_PREMIUM, LinkStatus.VALUE_ID_PREMIUM_DISABLE); } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); this.setBrowserExclusive(); @@ -67,7 +67,7 @@ public class UploadingCom extends PluginForHost { return ai; } - @Override + //@Override public void handlePremium(DownloadLink link, Account account) throws Exception { getFileInformation(link); login(account); @@ -109,7 +109,7 @@ public class UploadingCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws PluginException, IOException { setBrowserExclusive(); br.setFollowRedirects(true); @@ -124,12 +124,12 @@ public class UploadingCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); br.setFollowRedirects(true); @@ -151,31 +151,31 @@ public class UploadingCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 5; } - @Override + //@Override public int getTimegapBetweenConnections() { return 2500; } - @Override + //@Override public void reset() { } - @Override + //@Override public int getMaxSimultanPremiumDownloadNum() { return simultanpremium; } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/UptalCom.java b/src/jd/plugins/host/UptalCom.java index 413436ee8f..89ef4b405b 100644 --- a/src/jd/plugins/host/UptalCom.java +++ b/src/jd/plugins/host/UptalCom.java @@ -34,12 +34,12 @@ public class UptalCom extends PluginForHost { this.setStartIntervall(100l); } - @Override + //@Override public String getAGBLink() { return "http://www.uptal.com/faq.php"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, InterruptedException, PluginException { this.setBrowserExclusive(); br.setFollowRedirects(false); @@ -53,12 +53,12 @@ public class UptalCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { String getlink; String filename = downloadLink.getName(); @@ -91,20 +91,20 @@ public class UptalCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { link.setProperty("directLink", null); } diff --git a/src/jd/plugins/host/VimeoCom.java b/src/jd/plugins/host/VimeoCom.java index f5c68f67d8..6e48d2a0d5 100644 --- a/src/jd/plugins/host/VimeoCom.java +++ b/src/jd/plugins/host/VimeoCom.java @@ -32,12 +32,12 @@ public class VimeoCom extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return AGB; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws Exception { this.setBrowserExclusive(); @@ -67,12 +67,12 @@ public class VimeoCom extends PluginForHost { return new Regex(this.clipData, "<" + tag + ">(.*?)").getMatch(0); } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { br.setDebug(true); getFileInformation(downloadLink); @@ -80,21 +80,21 @@ public class VimeoCom extends PluginForHost { } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { /* TODO: Wert nachprüfen */ return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/Vipfilecom.java b/src/jd/plugins/host/Vipfilecom.java index 0ebac38bc3..a10a98c2c7 100644 --- a/src/jd/plugins/host/Vipfilecom.java +++ b/src/jd/plugins/host/Vipfilecom.java @@ -38,12 +38,12 @@ public class Vipfilecom extends PluginForHost { enablePremium("http://vip-file.com/tmpl/premium_en.php"); } - @Override + //@Override public String getAGBLink() { return "http://vip-file.com/tmpl/terms.php"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws PluginException, IOException { String downloadURL = downloadLink.getDownloadURL(); this.setBrowserExclusive(); @@ -62,12 +62,12 @@ public class Vipfilecom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); /* DownloadLink holen, 2x der Location folgen */ @@ -86,7 +86,7 @@ public class Vipfilecom extends PluginForHost { br.openDownload(downloadLink, link, true, 0).startDownload(); } - @Override + //@Override public void handlePremium(DownloadLink downloadLink, Account account) throws Exception { getFileInformation(downloadLink); Form form = br.getForm(1); @@ -98,20 +98,20 @@ public class Vipfilecom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/WrzucajCom.java b/src/jd/plugins/host/WrzucajCom.java index be87cab2ac..e7682a8ec6 100644 --- a/src/jd/plugins/host/WrzucajCom.java +++ b/src/jd/plugins/host/WrzucajCom.java @@ -34,12 +34,12 @@ public class WrzucajCom extends PluginForHost { this.setStartIntervall(5000l); } - @Override + //@Override public String getAGBLink() { return "http://www.wrzucaj.com/regulamin.php"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, InterruptedException, PluginException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -52,12 +52,12 @@ public class WrzucajCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); String linkurl = br.getRegex("innerHTML = 'Kliknij").getMatch(0); @@ -70,20 +70,20 @@ public class WrzucajCom extends PluginForHost { } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/WrzutaPl.java b/src/jd/plugins/host/WrzutaPl.java index 1b3dc5ec8e..1cac804729 100644 --- a/src/jd/plugins/host/WrzutaPl.java +++ b/src/jd/plugins/host/WrzutaPl.java @@ -38,12 +38,12 @@ public class WrzutaPl extends PluginForHost { this.setStartIntervall(5000l); } - @Override + //@Override public String getAGBLink() { return "http://www.wrzuta.pl/regulamin/"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, InterruptedException, PluginException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -61,12 +61,12 @@ public class WrzutaPl extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); boolean addext = true; @@ -117,20 +117,20 @@ public class WrzutaPl extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/WyslijToPl.java b/src/jd/plugins/host/WyslijToPl.java index 9a0cca965f..68676c3512 100644 --- a/src/jd/plugins/host/WyslijToPl.java +++ b/src/jd/plugins/host/WyslijToPl.java @@ -34,12 +34,12 @@ public class WyslijToPl extends PluginForHost { this.setStartIntervall(5000l); } - @Override + //@Override public String getAGBLink() { return "http://wyslijto.pl/rules"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, InterruptedException, PluginException { this.setBrowserExclusive(); br.setFollowRedirects(true); @@ -53,12 +53,12 @@ public class WyslijToPl extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); String fileid = new Regex(downloadLink.getDownloadURL(), "([^/]+)$").getMatch(0); @@ -73,20 +73,20 @@ public class WyslijToPl extends PluginForHost { } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/XsharewareCom.java b/src/jd/plugins/host/XsharewareCom.java index 312647f469..11e31d227e 100644 --- a/src/jd/plugins/host/XsharewareCom.java +++ b/src/jd/plugins/host/XsharewareCom.java @@ -37,7 +37,7 @@ public class XsharewareCom extends PluginForHost { super(wrapper); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); br.setFollowRedirects(false); @@ -86,7 +86,7 @@ public class XsharewareCom extends PluginForHost { } } - @Override + //@Override // TODO: AntiCaptcha Method would allow simultanous connections // if user is quick; he can enter captchas one-by-one and then server allow // him simulatanous downloads @@ -95,12 +95,12 @@ public class XsharewareCom extends PluginForHost { return 10; } - @Override + //@Override public String getAGBLink() { return "http://www.xshareware.com/tos.html"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -113,20 +113,20 @@ public class XsharewareCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { } diff --git a/src/jd/plugins/host/XupIn.java b/src/jd/plugins/host/XupIn.java index c54332ae19..c876dc6887 100644 --- a/src/jd/plugins/host/XupIn.java +++ b/src/jd/plugins/host/XupIn.java @@ -36,12 +36,12 @@ public class XupIn extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return AGB_LINK; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL()); @@ -53,12 +53,12 @@ public class XupIn extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { br.setDebug(true); this.getFileInformation(downloadLink); @@ -89,21 +89,21 @@ public class XupIn extends PluginForHost { } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/XupInRaidrush.java b/src/jd/plugins/host/XupInRaidrush.java index 232a7f3f7b..0541df2546 100644 --- a/src/jd/plugins/host/XupInRaidrush.java +++ b/src/jd/plugins/host/XupInRaidrush.java @@ -33,12 +33,12 @@ public class XupInRaidrush extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return AGB_LINK; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException { br.getPage(downloadLink.getDownloadURL()); @@ -51,13 +51,13 @@ public class XupInRaidrush extends PluginForHost { } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { if (!getFileInformation(downloadLink)) { throw new PluginException(LinkStatus.ERROR_FILE_NOT_FOUND); } Form download = br.getForms()[0]; @@ -65,21 +65,21 @@ public class XupInRaidrush extends PluginForHost { } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/YouPornCom.java b/src/jd/plugins/host/YouPornCom.java index da6b5e137e..5f14f066ec 100644 --- a/src/jd/plugins/host/YouPornCom.java +++ b/src/jd/plugins/host/YouPornCom.java @@ -29,12 +29,12 @@ public class YouPornCom extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://youporn.com/terms"; } - @Override + //@Override public boolean getFileInformation(DownloadLink parameter) throws IOException { this.setBrowserExclusive(); br.setFollowRedirects(true); @@ -45,28 +45,28 @@ public class YouPornCom extends PluginForHost { return true; } - @Override + //@Override public void handleFree(DownloadLink link) throws Exception { getFileInformation(link); br.openDownload(link, link.getDownloadURL()).startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/YourFileSendercom.java b/src/jd/plugins/host/YourFileSendercom.java index ca51d414d3..01fbd45356 100644 --- a/src/jd/plugins/host/YourFileSendercom.java +++ b/src/jd/plugins/host/YourFileSendercom.java @@ -33,12 +33,12 @@ public class YourFileSendercom extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://www.yourfilesender.com/terms.php"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { String downloadurl = downloadLink.getDownloadURL(); this.setBrowserExclusive(); @@ -57,13 +57,13 @@ public class YourFileSendercom extends PluginForHost { } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { /* Nochmals das File überprüfen */ @@ -83,22 +83,22 @@ public class YourFileSendercom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { /* TODO: Wert prüfen */ return 1; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/YourFilesBiz.java b/src/jd/plugins/host/YourFilesBiz.java index f0e2cb7da7..bb9efab121 100644 --- a/src/jd/plugins/host/YourFilesBiz.java +++ b/src/jd/plugins/host/YourFilesBiz.java @@ -33,12 +33,12 @@ public class YourFilesBiz extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://yourfiles.biz/rules.php"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, PluginException { setBrowserExclusive(); br.setFollowRedirects(true); @@ -56,12 +56,12 @@ public class YourFilesBiz extends PluginForHost { br.setCookie("http://yourfiles.to/", "yab_mylang", "en"); } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); String url = br.getRegex(Pattern.compile("document.location=\"(http.*?getfile\\.php.*?)\"'>", Pattern.CASE_INSENSITIVE)).getMatch(0); @@ -75,20 +75,20 @@ public class YourFilesBiz extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/Youtube.java b/src/jd/plugins/host/Youtube.java index 75cbbf06f8..b06ad78de4 100644 --- a/src/jd/plugins/host/Youtube.java +++ b/src/jd/plugins/host/Youtube.java @@ -38,12 +38,12 @@ public class Youtube extends PluginForHost { enablePremium("http://www.youtube.com/login?next=/index"); } - @Override + //@Override public String getAGBLink() { return "http://youtube.com/t/terms"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException { downloadLink.setFinalFileName(downloadLink.getStringProperty("finalname", "video.tmp")); br.setFollowRedirects(true); @@ -56,12 +56,12 @@ public class Youtube extends PluginForHost { return false; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { LinkStatus linkStatus = downloadLink.getLinkStatus(); br.setCookiesExclusive(true); @@ -87,7 +87,7 @@ public class Youtube extends PluginForHost { } } - @Override + //@Override public void handlePremium(DownloadLink downloadLink, Account account) throws Exception { LinkStatus linkStatus = downloadLink.getLinkStatus(); login(account); @@ -112,16 +112,16 @@ public class Youtube extends PluginForHost { } } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } @@ -135,7 +135,7 @@ public class Youtube extends PluginForHost { if (!br.getRegex("YouTube - " + account.getUser() + "'s YouTube").matches()) { throw new PluginException(LinkStatus.ERROR_PREMIUM, LinkStatus.VALUE_ID_PREMIUM_DISABLE); } } - @Override + //@Override public AccountInfo fetchAccountInfo(Account account) throws Exception { AccountInfo ai = new AccountInfo(this, account); try { @@ -151,7 +151,7 @@ public class Youtube extends PluginForHost { return ai; } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/ZShareNet.java b/src/jd/plugins/host/ZShareNet.java index 31c87073c6..a22da65ddb 100644 --- a/src/jd/plugins/host/ZShareNet.java +++ b/src/jd/plugins/host/ZShareNet.java @@ -30,12 +30,12 @@ public class ZShareNet extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://www.zshare.net/TOS.html"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) { try { br.setCookiesExclusive(true); @@ -55,12 +55,12 @@ public class ZShareNet extends PluginForHost { return false; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { br.setCookiesExclusive(true); br.clearCookies(getHost()); @@ -86,20 +86,20 @@ public class ZShareNet extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/ZetshareCom.java b/src/jd/plugins/host/ZetshareCom.java index fd8c4c29c0..b14336fe0f 100644 --- a/src/jd/plugins/host/ZetshareCom.java +++ b/src/jd/plugins/host/ZetshareCom.java @@ -32,12 +32,12 @@ public class ZetshareCom extends PluginForHost { super(wrapper); } - @Override + //@Override public String getAGBLink() { return "http://www.zetshare.com/download/index.php?page=tos"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, InterruptedException, PluginException { this.setBrowserExclusive(); String url = downloadLink.getDownloadURL(); @@ -60,12 +60,12 @@ public class ZetshareCom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { /* Nochmals das File überprüfen */ getFileInformation(downloadLink); @@ -84,20 +84,20 @@ public class ZetshareCom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 10; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/host/Zippysharecom.java b/src/jd/plugins/host/Zippysharecom.java index 8e7177a238..1f3b63e47a 100644 --- a/src/jd/plugins/host/Zippysharecom.java +++ b/src/jd/plugins/host/Zippysharecom.java @@ -34,12 +34,12 @@ public class Zippysharecom extends PluginForHost { br.setFollowRedirects(true); } - @Override + //@Override public String getAGBLink() { return "http://www.zippyshare.com/terms.html"; } - @Override + //@Override public boolean getFileInformation(DownloadLink downloadLink) throws IOException, InterruptedException, PluginException { this.setBrowserExclusive(); br.getPage(downloadLink.getDownloadURL().replaceAll("locale=..", "locale=en")); @@ -53,12 +53,12 @@ public class Zippysharecom extends PluginForHost { return true; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public void handleFree(DownloadLink downloadLink) throws Exception { getFileInformation(downloadLink); String linkurl = new Regex(br, Pattern.compile("'(http.*?www.*?zippyshare\\.com.*?)';", Pattern.CASE_INSENSITIVE)).getMatch(0); @@ -70,20 +70,20 @@ public class Zippysharecom extends PluginForHost { dl.startDownload(); } - @Override + //@Override public int getMaxSimultanFreeDownloadNum() { return 20; } - @Override + //@Override public void reset() { } - @Override + //@Override public void resetPluginGlobals() { } - @Override + //@Override public void reset_downloadlink(DownloadLink link) { // TODO Auto-generated method stub diff --git a/src/jd/plugins/optional/JDFolderWatch.java b/src/jd/plugins/optional/JDFolderWatch.java index 80ff75d9d0..7edbf1cdea 100755 --- a/src/jd/plugins/optional/JDFolderWatch.java +++ b/src/jd/plugins/optional/JDFolderWatch.java @@ -34,7 +34,7 @@ import jd.utils.JDUtilities; @SuppressWarnings("unchecked") public class JDFolderWatch extends PluginOptional { public class check extends Thread { - @Override + //@Override public void run() { threadend = true; while (threadend) { @@ -71,7 +71,7 @@ public class JDFolderWatch extends PluginOptional { cfg.setDefaultValue("5"); } - @Override + //@Override public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("Check")) { checkFolder(); @@ -129,7 +129,7 @@ public class JDFolderWatch extends PluginOptional { } } - @Override + //@Override public ArrayList createMenuitems() { ArrayList menu = new ArrayList(); menu.add(new MenuItem(JDLocale.L("plugins.optional.folderwatch.menu.startstop", "Start/Stop"), 0).setActionListener(this)); @@ -138,17 +138,17 @@ public class JDFolderWatch extends PluginOptional { return menu; } - @Override + //@Override public String getHost() { return JDLocale.L("plugins.optional.folderwatch.name", "JDFolderWatch"); } - @Override + //@Override public String getRequirements() { return "JRE 1.5+"; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } @@ -157,7 +157,7 @@ public class JDFolderWatch extends PluginOptional { return subConfig.getIntegerProperty("WAITTIME", 5) * 60000; } - @Override + //@Override public boolean initAddon() { if (JDUtilities.getJavaVersion() >= 1.5) { logger.info("FolderWatch OK"); @@ -176,7 +176,7 @@ public class JDFolderWatch extends PluginOptional { } } - @Override + //@Override public void onExit() { } } \ No newline at end of file diff --git a/src/jd/plugins/optional/JDGrowlNotification.java b/src/jd/plugins/optional/JDGrowlNotification.java index 405d06c8d1..8b72b2a1b6 100644 --- a/src/jd/plugins/optional/JDGrowlNotification.java +++ b/src/jd/plugins/optional/JDGrowlNotification.java @@ -30,22 +30,22 @@ public class JDGrowlNotification extends PluginOptional { private static final String PROPERTY_ENABLED = "PROPERTY_ENABLED"; - @Override + //@Override public String getRequirements() { return "JRE 1.5+"; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public String getHost() { return JDLocale.L("plugins.optional.jdgrowlnotification.name", "JDGrowlNotification"); } - @Override + //@Override public boolean initAddon() { JDUtilities.getController().addControlListener(this); logger.info("Growl OK"); @@ -61,7 +61,7 @@ public class JDGrowlNotification extends PluginOptional { } } - @Override + //@Override public ArrayList createMenuitems() { ArrayList menu = new ArrayList(); MenuItem m; @@ -112,7 +112,7 @@ public class JDGrowlNotification extends PluginOptional { } } - @Override + //@Override public void onExit() { JDUtilities.getController().removeControlListener(this); } diff --git a/src/jd/plugins/optional/JDInfoFileWriter.java b/src/jd/plugins/optional/JDInfoFileWriter.java index deabfd64a5..f67fee6ace 100644 --- a/src/jd/plugins/optional/JDInfoFileWriter.java +++ b/src/jd/plugins/optional/JDInfoFileWriter.java @@ -69,7 +69,7 @@ public class JDInfoFileWriter extends PluginOptional implements ControlListener initConfig(); } - @Override + //@Override public void controlEvent(ControlEvent event) { super.controlEvent(event); if (event.getID() == ControlEvent.CONTROL_PLUGIN_INACTIVE && event.getSource() instanceof PluginForHost) { @@ -81,27 +81,27 @@ public class JDInfoFileWriter extends PluginOptional implements ControlListener } } - @Override + //@Override public ArrayList createMenuitems() { return null; } - @Override + //@Override public String getHost() { return JDLocale.L("plugins.optional.infoFileWriter.name", "Info File Writer"); } - @Override + //@Override public String getRequirements() { return "JRE 1.5+"; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public boolean initAddon() { JDUtilities.getController().addControlListener(this); return true; @@ -117,7 +117,7 @@ public class JDInfoFileWriter extends PluginOptional implements ControlListener config.addEntry(txtInfo = new ConfigEntry(ConfigContainer.TYPE_TEXTAREA, subConfig, PARAM_INFO_STRING, JDLocale.L("plugins.optional.infoFileWriter.content", "Content:")).setDefaultValue(INFO_STRING_DEFAULT)); } - @Override + //@Override public void actionPerformed(ActionEvent e) { JComboBox cmb = ((JComboBox) ((GUIConfigEntry) cmbVars.getGuiListener()).getInput()[0]); if (cmb.getSelectedIndex() < 0) return; @@ -125,7 +125,7 @@ public class JDInfoFileWriter extends PluginOptional implements ControlListener txt.insert("%" + Replacer.getKey(cmb.getSelectedIndex()) + "%", txt.getCaretPosition()); } - @Override + //@Override public void onExit() { JDUtilities.getController().removeControlListener(this); } diff --git a/src/jd/plugins/optional/JDLowSpeed.java b/src/jd/plugins/optional/JDLowSpeed.java index b043868e26..62154f4baa 100644 --- a/src/jd/plugins/optional/JDLowSpeed.java +++ b/src/jd/plugins/optional/JDLowSpeed.java @@ -62,7 +62,7 @@ public class JDLowSpeed extends PluginOptional { cfg.setDefaultValue("40"); } - @Override + //@Override public void actionPerformed(ActionEvent e) { MenuItem mi = (MenuItem) e.getSource(); if (mi.getActionID() == 0) { @@ -78,7 +78,7 @@ public class JDLowSpeed extends PluginOptional { } } - @Override + //@Override public void controlEvent(ControlEvent event) { super.controlEvent(event); if (subConfig.getBooleanProperty(PROPERTY_ENABLED, false)) { @@ -133,7 +133,7 @@ public class JDLowSpeed extends PluginOptional { } } - @Override + //@Override public ArrayList createMenuitems() { ArrayList menu = new ArrayList(); MenuItem m; @@ -142,22 +142,22 @@ public class JDLowSpeed extends PluginOptional { return menu; } - @Override + //@Override public String getHost() { return JDLocale.L("plugins.optional.jdlowspeed.name", "Low-Speed Detection"); } - @Override + //@Override public String getRequirements() { return "JRE 1.5+"; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public boolean initAddon() { JDUtilities.getController().addControlListener(this); logger.info("JDLowSpeed detection ok"); @@ -221,7 +221,7 @@ public class JDLowSpeed extends PluginOptional { } } - @Override + //@Override public void onExit() { } diff --git a/src/jd/plugins/optional/JDPremiumCollector.java b/src/jd/plugins/optional/JDPremiumCollector.java index 356d289904..8a1e75c8ed 100644 --- a/src/jd/plugins/optional/JDPremiumCollector.java +++ b/src/jd/plugins/optional/JDPremiumCollector.java @@ -106,25 +106,25 @@ public class JDPremiumCollector extends PluginOptional { t.start(); } - @Override + //@Override public void actionPerformed(ActionEvent e) { if (e.getSource() instanceof MenuItem && ((MenuItem) e.getSource()).getActionID() == 0) { fetchAccounts(); } } - @Override + //@Override public String getRequirements() { return "JRE 1.5+"; } - @Override + //@Override public boolean initAddon() { JDUtilities.getController().addControlListener(this); return true; } - @Override + //@Override public void controlEvent(ControlEvent event) { if (event.getID() == ControlEvent.CONTROL_INIT_COMPLETE && event.getSource() instanceof Main) { fetchAccounts(); @@ -143,12 +143,12 @@ public class JDPremiumCollector extends PluginOptional { config.addEntry(new ConfigEntry(ConfigContainer.TYPE_CHECKBOX, subConfig, PROPERTY_ACCOUNTS2, JDLocale.L("plugins.optional.premiumcollector.onlyValid2", "Remove invalid and expired accounts")).setDefaultValue(true)); } - @Override + //@Override public void onExit() { JDUtilities.getController().removeControlListener(this); } - @Override + //@Override public ArrayList createMenuitems() { ArrayList menu = new ArrayList(); @@ -157,17 +157,17 @@ public class JDPremiumCollector extends PluginOptional { return menu; } - @Override + //@Override public String getIconKey() { return "gui.images.taskpanes.premium"; } - @Override + //@Override public String getHost() { return JDLocale.L("plugins.optional.premiumcollector.name", "PremiumCollector"); } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } @@ -187,7 +187,7 @@ public class JDPremiumCollector extends PluginOptional { this.pc = pc; } - @Override + //@Override public void run() { ArrayList accounts = new ArrayList(); for (String[] acc : accs) { diff --git a/src/jd/plugins/optional/JDShutdown.java b/src/jd/plugins/optional/JDShutdown.java index 167ecddfb6..a40da07ba1 100644 --- a/src/jd/plugins/optional/JDShutdown.java +++ b/src/jd/plugins/optional/JDShutdown.java @@ -58,7 +58,7 @@ public class JDShutdown extends PluginOptional { initConfig(); } - @Override + //@Override public void actionPerformed(ActionEvent e) { if (e.getSource() == menuItem) { menuItem.setSelected(!menuItem.isSelected()); @@ -70,7 +70,7 @@ public class JDShutdown extends PluginOptional { } } - @Override + //@Override public void controlEvent(ControlEvent event) { super.controlEvent(event); if (menuItem != null && menuItem.isSelected()) { @@ -90,7 +90,7 @@ public class JDShutdown extends PluginOptional { } } - @Override + //@Override public ArrayList createMenuitems() { ArrayList menu = new ArrayList(); if (menuItem == null) menuItem = new MenuItem(MenuItem.TOGGLE, JDLocale.L("addons.jdshutdown.menu", "Shutdown after downloads finished"), 0).setActionListener(this); @@ -98,22 +98,22 @@ public class JDShutdown extends PluginOptional { return menu; } - @Override + //@Override public String getHost() { return JDLocale.L("plugins.optional.jdshutdown.name", "JDShutdown"); } - @Override + //@Override public String getRequirements() { return "JRE 1.5+"; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public boolean initAddon() { JDUtilities.getController().addControlListener(this); @@ -121,7 +121,7 @@ public class JDShutdown extends PluginOptional { return true; } - @Override + //@Override public void onExit() { JDUtilities.getController().removeControlListener(this); } diff --git a/src/jd/plugins/optional/hjsplit/JDHJSplit.java b/src/jd/plugins/optional/hjsplit/JDHJSplit.java index 398e78fa54..9c2087a873 100644 --- a/src/jd/plugins/optional/hjsplit/JDHJSplit.java +++ b/src/jd/plugins/optional/hjsplit/JDHJSplit.java @@ -71,7 +71,7 @@ public class JDHJSplit extends PluginOptional implements ControlListener { initConfig(); } - @Override + //@Override public String getIconKey() { return "gui.images.addons.merge"; } @@ -84,7 +84,7 @@ public class JDHJSplit extends PluginOptional implements ControlListener { * ins kontextmenü der gui die menüpunkte zu schreiben */ @SuppressWarnings("unchecked") - @Override + //@Override public void controlEvent(ControlEvent event) { super.controlEvent(event); DownloadLink link; @@ -133,7 +133,7 @@ public class JDHJSplit extends PluginOptional implements ControlListener { } } - @Override + //@Override public ArrayList createMenuitems() { ArrayList menu = new ArrayList(); MenuItem m; @@ -146,7 +146,7 @@ public class JDHJSplit extends PluginOptional implements ControlListener { return menu; } - @Override + //@Override public void actionPerformed(ActionEvent e) { if (e.getSource() instanceof MenuItem) { menuitemActionPerformed(e, (MenuItem) e.getSource()); @@ -164,14 +164,14 @@ public class JDHJSplit extends PluginOptional implements ControlListener { JDFileChooser fc = new JDFileChooser("_JDHJSPLIT_"); fc.setMultiSelectionEnabled(true); FileFilter ff = new FileFilter() { - @Override + //@Override public boolean accept(File pathname) { if (isStartVolume(pathname)) return true; if (pathname.isDirectory()) return true; return false; } - @Override + //@Override public String getDescription() { return JDLocale.L("plugins.optional.hjsplit.filefilter", "HJSPLIT-Startvolumes"); } @@ -515,22 +515,22 @@ public class JDHJSplit extends PluginOptional implements ControlListener { return link; } - @Override + //@Override public String getHost() { return JDLocale.L("plugins.optional.jdhjsplit.name", "JD-HJMerge"); } - @Override + //@Override public String getRequirements() { return "JRE 1.5+"; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public boolean initAddon() { JDUtilities.getController().addControlListener(this); return true; @@ -546,7 +546,7 @@ public class JDHJSplit extends PluginOptional implements ControlListener { ce.setDefaultValue(true); } - @Override + //@Override public void onExit() { JDUtilities.getController().removeControlListener(this); } diff --git a/src/jd/plugins/optional/hjsplit/jaxe/CountingInputStream.java b/src/jd/plugins/optional/hjsplit/jaxe/CountingInputStream.java index 879742e232..f33baa0b4b 100644 --- a/src/jd/plugins/optional/hjsplit/jaxe/CountingInputStream.java +++ b/src/jd/plugins/optional/hjsplit/jaxe/CountingInputStream.java @@ -34,12 +34,12 @@ public class CountingInputStream extends InputStream { is = input; } - @Override + //@Override public int available() throws IOException { return is.available(); } - @Override + //@Override public void close() throws IOException { is.close(); } @@ -63,24 +63,24 @@ public class CountingInputStream extends InputStream { return lRead; } - @Override + //@Override public void mark(int i) { is.mark(i); } - @Override + //@Override public boolean markSupported() { return is.markSupported(); } - @Override + //@Override public int read() throws IOException { lRead++; iLastRead = 1; return is.read(); } - @Override + //@Override public int read(byte[] ba) throws IOException { iLastRead = is.read(ba); @@ -88,7 +88,7 @@ public class CountingInputStream extends InputStream { return iLastRead; } - @Override + //@Override public int read(byte[] ba, int off, int len) throws IOException { iLastRead = is.read(ba, off, len); @@ -96,7 +96,7 @@ public class CountingInputStream extends InputStream { return iLastRead; } - @Override + //@Override public void reset() throws IOException { is.reset(); } @@ -105,7 +105,7 @@ public class CountingInputStream extends InputStream { lTotal = l; } - @Override + //@Override public long skip(long l) throws IOException { return is.skip(l); } diff --git a/src/jd/plugins/optional/hjsplit/jaxe/JAxeJoiner.java b/src/jd/plugins/optional/hjsplit/jaxe/JAxeJoiner.java index d71210cb5b..217eeff617 100644 --- a/src/jd/plugins/optional/hjsplit/jaxe/JAxeJoiner.java +++ b/src/jd/plugins/optional/hjsplit/jaxe/JAxeJoiner.java @@ -51,14 +51,14 @@ public class JAxeJoiner extends AxeWriterWorker { sDestDir = sDir; } - @Override + //@Override protected boolean checkNoOverwrite(File f) { File fTemp = new File(sJoinedFile); return !fTemp.exists(); } - @Override + //@Override protected void computeJobSize() { long lReturn = 0; int i = 1; @@ -77,7 +77,7 @@ public class JAxeJoiner extends AxeWriterWorker { new File(sJoinedFile).delete(); } - @Override + //@Override public void run() { File fToJoin, fTemp = null; InputStream is = null; diff --git a/src/jd/plugins/optional/hjsplit/jaxe/SplitFileFilter.java b/src/jd/plugins/optional/hjsplit/jaxe/SplitFileFilter.java index fd359bac65..6fe12c5839 100644 --- a/src/jd/plugins/optional/hjsplit/jaxe/SplitFileFilter.java +++ b/src/jd/plugins/optional/hjsplit/jaxe/SplitFileFilter.java @@ -65,12 +65,12 @@ public class SplitFileFilter extends FileFilter { bIESafe = true; } - @Override + //@Override public boolean accept(File f) { return SplitFileFilter.isSplitFile(f.getName(), bIESafe) || f.isDirectory() || SplitFileFilter.isZippedSplitFile(f.getName()); } - @Override + //@Override public String getDescription() { return "Files split using JAxe/HJSplit"; } diff --git a/src/jd/plugins/optional/hjsplit/jaxe/UnixSplitFileFilter.java b/src/jd/plugins/optional/hjsplit/jaxe/UnixSplitFileFilter.java index dcfc7ef59c..87c28590d4 100644 --- a/src/jd/plugins/optional/hjsplit/jaxe/UnixSplitFileFilter.java +++ b/src/jd/plugins/optional/hjsplit/jaxe/UnixSplitFileFilter.java @@ -43,12 +43,12 @@ public class UnixSplitFileFilter extends FileFilter { public UnixSplitFileFilter() { } - @Override + //@Override public boolean accept(File f) { return UnixSplitFileFilter.isSplitFile(f.getName()) || f.isDirectory(); } - @Override + //@Override public String getDescription() { return "Files split using Unix split"; } diff --git a/src/jd/plugins/optional/hjsplit/jaxe/UnixSplitJoiner.java b/src/jd/plugins/optional/hjsplit/jaxe/UnixSplitJoiner.java index 8b6f159d24..f58760deb5 100644 --- a/src/jd/plugins/optional/hjsplit/jaxe/UnixSplitJoiner.java +++ b/src/jd/plugins/optional/hjsplit/jaxe/UnixSplitJoiner.java @@ -41,14 +41,14 @@ public class UnixSplitJoiner extends JAxeJoiner { super(sFile, sDir); } - @Override + //@Override protected boolean checkNoOverwrite(File f) { File fTemp = new File(sJoinedFile); return !fTemp.exists(); } - @Override + //@Override protected void computeJobSize() { long lReturn = 0; int i = 0; @@ -63,7 +63,7 @@ public class UnixSplitJoiner extends JAxeJoiner { lJobSize = lReturn; } - @Override + //@Override protected void doCleanup() { new File(sJoinedFile).delete(); } @@ -77,7 +77,7 @@ public class UnixSplitJoiner extends JAxeJoiner { return "." + new String(ca); } - @Override + //@Override public void run() { File fToJoin, fTemp = null; InputStream is = null; diff --git a/src/jd/plugins/optional/jdchat/JDChat.java b/src/jd/plugins/optional/jdchat/JDChat.java index b3e288bdc6..216e191ddb 100644 --- a/src/jd/plugins/optional/jdchat/JDChat.java +++ b/src/jd/plugins/optional/jdchat/JDChat.java @@ -620,7 +620,7 @@ public class JDChat extends PluginOptional implements ControlListener { } - @Override + //@Override public void actionPerformed(ActionEvent e) { if (!((MenuItem) e.getSource()).isSelected()) { @@ -726,7 +726,7 @@ public class JDChat extends PluginOptional implements ControlListener { updateNamesPanel(); } - @Override + //@Override public void controlEvent(ControlEvent e) { if (e.getID() == ControlEvent.CONTROL_INTERACTION_CALL) { @@ -754,7 +754,7 @@ public class JDChat extends PluginOptional implements ControlListener { } } - @Override + //@Override public ArrayList createMenuitems() { ArrayList menu = new ArrayList(); MenuItem m; @@ -820,12 +820,12 @@ public class JDChat extends PluginOptional implements ControlListener { return nick; } - @Override + //@Override public String getHost() { return JDLocale.L("plugins.optional.jdchat.name", "JD Chat"); } - @Override + //@Override public String getRequirements() { return "JRE 1.5+"; } @@ -839,12 +839,12 @@ public class JDChat extends PluginOptional implements ControlListener { } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public boolean initAddon() { NAMES = new ArrayList(); sb = new StringBuilder(); @@ -916,11 +916,11 @@ public class JDChat extends PluginOptional implements ControlListener { private static final long serialVersionUID = 2138710083573682339L; - @Override + //@Override public void onDisplay() { } - @Override + //@Override public void onHide() { } @@ -1157,7 +1157,7 @@ public class JDChat extends PluginOptional implements ControlListener { } - @Override + //@Override public void onExit() { NAMES.clear(); this.setLoggedIn(false); @@ -1367,7 +1367,7 @@ public class JDChat extends PluginOptional implements ControlListener { SimpleGUI.CURRENTGUI.getTaskPane().switcher(tp); JDUtilities.getController().addControlListener(this); new Thread() { - @Override + //@Override public void run() { initIRC(); @@ -1389,7 +1389,7 @@ public class JDChat extends PluginOptional implements ControlListener { } } - @Override + //@Override public String getIconKey() { return "gui.images.chat"; @@ -1437,7 +1437,7 @@ public class JDChat extends PluginOptional implements ControlListener { private void startAwayObserver() { Thread th = new Thread() { - @Override + //@Override public void run() { while (true) { if (System.currentTimeMillis() - lastAction > AWAY_TIMEOUT) { diff --git a/src/jd/plugins/optional/jdchat/User.java b/src/jd/plugins/optional/jdchat/User.java index 3abb0dc0c1..055ce71667 100644 --- a/src/jd/plugins/optional/jdchat/User.java +++ b/src/jd/plugins/optional/jdchat/User.java @@ -99,7 +99,7 @@ public class User implements Comparable { } - @Override + //@Override public String toString() { switch (rank) { case RANK_OP: diff --git a/src/jd/plugins/optional/jdtrayicon/JDLightTray.java b/src/jd/plugins/optional/jdtrayicon/JDLightTray.java index b9206ba080..289044481c 100644 --- a/src/jd/plugins/optional/jdtrayicon/JDLightTray.java +++ b/src/jd/plugins/optional/jdtrayicon/JDLightTray.java @@ -82,27 +82,27 @@ public class JDLightTray extends PluginOptional implements MouseListener, MouseM initConfig(); } - @Override + //@Override public ArrayList createMenuitems() { return null; } - @Override + //@Override public String getHost() { return JDLocale.L("plugins.optional.JDLightTray.name", "JDLightTrayIcon"); } - @Override + //@Override public String getRequirements() { return "JRE 1.6+"; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public boolean initAddon() { if (JDUtilities.getJavaVersion() < 1.6) { logger.severe("Error initializing SystemTray: Tray is supported since Java 1.6. your Version: " + JDUtilities.getJavaVersion()); @@ -135,7 +135,7 @@ public class JDLightTray extends PluginOptional implements MouseListener, MouseM config.addEntry(new ConfigEntry(ConfigContainer.TYPE_CHECKBOX, subConfig, PROPERTY_TOOLTIP, JDLocale.L("plugins.optional.JDLightTray.tooltip", "Show Tooltip")).setDefaultValue(true)); } - @Override + //@Override public void controlEvent(ControlEvent event) { if (event.getID() == ControlEvent.CONTROL_INIT_COMPLETE && event.getSource() instanceof Main) { logger.info("JDLightTrayIcon Init complete"); @@ -225,7 +225,7 @@ public class JDLightTray extends PluginOptional implements MouseListener, MouseM tit.show(e); } - @Override + //@Override public void onExit() { if (trayIcon != null) SystemTray.getSystemTray().remove(trayIcon); JDUtilities.getController().removeControlListener(this); diff --git a/src/jd/plugins/optional/jdtrayicon/TrayIconTooltip.java b/src/jd/plugins/optional/jdtrayicon/TrayIconTooltip.java index 1581781d9b..0188ab2bbb 100644 --- a/src/jd/plugins/optional/jdtrayicon/TrayIconTooltip.java +++ b/src/jd/plugins/optional/jdtrayicon/TrayIconTooltip.java @@ -152,7 +152,7 @@ public class TrayIconTooltip { this.p = p; } - @Override + //@Override public void run() { try { Thread.sleep(1000); diff --git a/src/jd/plugins/optional/jdunrar/JDUnrar.java b/src/jd/plugins/optional/jdunrar/JDUnrar.java index 999601e021..df9f906b71 100644 --- a/src/jd/plugins/optional/jdunrar/JDUnrar.java +++ b/src/jd/plugins/optional/jdunrar/JDUnrar.java @@ -87,7 +87,7 @@ public class JDUnrar extends PluginOptional implements ControlListener, UnrarLis * das controllevent fängt heruntergeladene file ab und wertet sie aus */ @SuppressWarnings("unchecked") - @Override + //@Override public void controlEvent(ControlEvent event) { super.controlEvent(event); DownloadLink link; @@ -456,7 +456,7 @@ public class JDUnrar extends PluginOptional implements ControlListener, UnrarLis return "gui.images.addons.unrar"; } - @Override + //@Override public ArrayList createMenuitems() { ArrayList menu = new ArrayList(); MenuItem m; @@ -494,7 +494,7 @@ public class JDUnrar extends PluginOptional implements ControlListener, UnrarLis return false; } - @Override + //@Override public String getDescription() { return JDLocale.L("plugins.optional.jdunrar.filefilter", "Rar-Startvolumes"); } @@ -604,7 +604,7 @@ public class JDUnrar extends PluginOptional implements ControlListener, UnrarLis return false; } - @Override + //@Override public String getDescription() { return JDLocale.L("plugins.optional.jdunrar.filefilter.extractto", "Extract Directory"); } @@ -646,22 +646,22 @@ public class JDUnrar extends PluginOptional implements ControlListener, UnrarLis } - @Override + //@Override public String getHost() { return JDLocale.L("plugins.optional.jdunrar.name", "JD-Unrar"); } - @Override + //@Override public String getRequirements() { return "JRE 1.5+"; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public boolean initAddon() { JDUtilities.getController().addControlListener(this); return true; @@ -693,13 +693,13 @@ public class JDUnrar extends PluginOptional implements ControlListener, UnrarLis config.addEntry(new ConfigEntry(ConfigContainer.TYPE_CONTAINER, passwordConfig)); SubConfiguration.getConfig(PasswordList.PROPERTY_PASSWORDLIST).addConfigurationListener(new ConfigurationListener() { - @Override + //@Override public void onPostSave(SubConfiguration subConfiguration) { // TODO Auto-generated method stub } - @Override + //@Override public void onPreSave(SubConfiguration subConfiguration) { PasswordList.cleanList(); } @@ -862,7 +862,7 @@ public class JDUnrar extends PluginOptional implements ControlListener, UnrarLis return UnrarWrapper.isUnrarCommandValid(path, reset); } - @Override + //@Override public void onExit() { JDUtilities.getController().removeControlListener(this); } @@ -1331,7 +1331,7 @@ public class JDUnrar extends PluginOptional implements ControlListener, UnrarLis } @SuppressWarnings("unchecked") - @Override + //@Override public Object interact(String command, Object parameter) { if (command.equals("getPasswordList")) { diff --git a/src/jd/plugins/optional/langfileeditor/LFEGui.java b/src/jd/plugins/optional/langfileeditor/LFEGui.java index c7220e92e0..afb1f36a4a 100644 --- a/src/jd/plugins/optional/langfileeditor/LFEGui.java +++ b/src/jd/plugins/optional/langfileeditor/LFEGui.java @@ -1002,7 +1002,7 @@ public class LFEGui extends JTabbedPanel implements ActionListener, MouseListene return this.getKey().compareToIgnoreCase(o.getKey()); } - @Override + //@Override public String toString() { return this.getKey() + " = " + this.getLanguage(); } @@ -1041,7 +1041,7 @@ public class LFEGui extends JTabbedPanel implements ActionListener, MouseListene return data.size(); } - @Override + //@Override public String getColumnName(int col) { return columnNames[col]; } @@ -1058,17 +1058,17 @@ public class LFEGui extends JTabbedPanel implements ActionListener, MouseListene return ""; } - @Override + //@Override public Class getColumnClass(int c) { return String.class; } - @Override + //@Override public boolean isCellEditable(int row, int col) { return true; } - @Override + //@Override public void setValueAt(Object value, int row, int col) { if (col == 2) { data.get(row).setLanguage((String) value); @@ -1146,7 +1146,7 @@ public class LFEGui extends JTabbedPanel implements ActionListener, MouseListene return tableData.size(); } - @Override + //@Override public String getColumnName(int col) { return columnNames[col]; } @@ -1169,13 +1169,13 @@ public class LFEGui extends JTabbedPanel implements ActionListener, MouseListene return ""; } - @Override + //@Override public Class getColumnClass(int col) { if (col == 0) return Integer.class; return String.class; } - @Override + //@Override public boolean isCellEditable(int row, int col) { return (col == 1); } @@ -1183,11 +1183,11 @@ public class LFEGui extends JTabbedPanel implements ActionListener, MouseListene } } - @Override + //@Override public void onDisplay() { } - @Override + //@Override public void onHide() { if (changed && JOptionPane.showConfirmDialog(this, JDLocale.L("plugins.optional.langfileeditor.changed.message", "Language File changed! Save changes?"), JDLocale.L("plugins.optional.langfileeditor.changed.title", "Save changes?"), JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) { saveLanguageFile(languageFile); diff --git a/src/jd/plugins/optional/langfileeditor/LangFileEditor.java b/src/jd/plugins/optional/langfileeditor/LangFileEditor.java index 859a463634..8bbd783584 100644 --- a/src/jd/plugins/optional/langfileeditor/LangFileEditor.java +++ b/src/jd/plugins/optional/langfileeditor/LangFileEditor.java @@ -42,28 +42,28 @@ public class LangFileEditor extends PluginOptional { lfe = new SingletonPanel(LFEGui.class); } - @Override + //@Override public void actionPerformed(ActionEvent e) { if (e.getSource() instanceof MenuItem && ((MenuItem) e.getSource()).getActionID() == 0) { SimpleGUI.CURRENTGUI.getContentPane().display(lfe.getPanel()); } } - @Override + //@Override public String getRequirements() { return "JRE 1.5+"; } - @Override + //@Override public boolean initAddon() { return true; } - @Override + //@Override public void onExit() { } - @Override + //@Override public ArrayList createMenuitems() { ArrayList menu = new ArrayList(); @@ -72,22 +72,22 @@ public class LangFileEditor extends PluginOptional { return menu; } - @Override + //@Override public String getCoder() { return "Greeny"; } - @Override + //@Override public String getIconKey() { return "gui.splash.languages"; } - @Override + //@Override public String getHost() { return JDLocale.L("plugins.optional.langfileeditor.name", "Language File Editor"); } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } diff --git a/src/jd/plugins/optional/schedule/Schedule.java b/src/jd/plugins/optional/schedule/Schedule.java index 5e5d752183..7c2c3ccc5b 100644 --- a/src/jd/plugins/optional/schedule/Schedule.java +++ b/src/jd/plugins/optional/schedule/Schedule.java @@ -63,7 +63,7 @@ public class Schedule extends PluginOptional { super(wrapper); } - @Override + //@Override public String getIconKey() { return "gui.images.config.eventmanager"; @@ -81,11 +81,11 @@ public class Schedule extends PluginOptional { private static final long serialVersionUID = 4758934444244058336L; - @Override + //@Override public void onDisplay() { } - @Override + //@Override public void onHide() { getPluginConfig().setProperty(PROPERTY_SCHEDULES, schedules); getPluginConfig().save(); @@ -137,7 +137,7 @@ public class Schedule extends PluginOptional { } - @Override + //@Override public void actionPerformed(ActionEvent e) { if (e.getSource() instanceof MenuItem && ((MenuItem) e.getSource()).getActionID() == 0) { initGUI(); @@ -217,40 +217,40 @@ public class Schedule extends PluginOptional { return 3; } - @Override + //@Override public ArrayList createMenuitems() { ArrayList menu = new ArrayList(); menu.add(new MenuItem(getHost(), 0).setActionListener(this)); return menu; } - @Override + //@Override public String getCoder() { return "JD-Team / Tudels"; } - @Override + //@Override public String getHost() { return JDLocale.L("addons.schedule.name", "Schedule"); } - @Override + //@Override public String getRequirements() { return "JRE 1.5+"; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } - @Override + //@Override public boolean initAddon() { logger.info("Schedule OK"); return true; } - @Override + //@Override public void onExit() { } diff --git a/src/jd/plugins/optional/webinterface/JDSimpleWebserver.java b/src/jd/plugins/optional/webinterface/JDSimpleWebserver.java index 3d3cb0488c..b110d39a8a 100644 --- a/src/jd/plugins/optional/webinterface/JDSimpleWebserver.java +++ b/src/jd/plugins/optional/webinterface/JDSimpleWebserver.java @@ -310,7 +310,7 @@ public class JDSimpleWebserver extends Thread { } } - @Override + //@Override public void run() { while (Server_Running) { try { diff --git a/src/jd/plugins/optional/webinterface/JDWebinterface.java b/src/jd/plugins/optional/webinterface/JDWebinterface.java index 36128073ef..cc53b03907 100644 --- a/src/jd/plugins/optional/webinterface/JDWebinterface.java +++ b/src/jd/plugins/optional/webinterface/JDWebinterface.java @@ -69,32 +69,32 @@ public class JDWebinterface extends PluginOptional { cfg.setDefaultValue("JD"); } - @Override + //@Override public void actionPerformed(ActionEvent e) { } - @Override + //@Override public ArrayList createMenuitems() { return null; } - @Override + //@Override public String getCoder() { return "jiaz"; } - @Override + //@Override public String getHost() { return JDLocale.L("plugins.optional.webinterface.name", "WebInterface"); } - @Override + //@Override public String getRequirements() { return "JRE 1.5+"; } - @Override + //@Override public String getVersion() { return getVersion("$Revision$"); } @@ -108,7 +108,7 @@ public class JDWebinterface extends PluginOptional { } } - @Override + //@Override public boolean initAddon() { @SuppressWarnings("unused") JDSimpleWebserver server = new JDSimpleWebserver(); @@ -116,7 +116,7 @@ public class JDWebinterface extends PluginOptional { return true; } - @Override + //@Override public void onExit() { } } \ No newline at end of file diff --git a/src/jd/plugins/optional/webinterface/template/Tmpl/Element/Conditional.java b/src/jd/plugins/optional/webinterface/template/Tmpl/Element/Conditional.java index 11bdd5d3c7..cd590b3413 100644 --- a/src/jd/plugins/optional/webinterface/template/Tmpl/Element/Conditional.java +++ b/src/jd/plugins/optional/webinterface/template/Tmpl/Element/Conditional.java @@ -54,7 +54,7 @@ public class Conditional extends Element { data[0] = new Vector(); } - @Override + //@Override public void add(Element node) { if (data[1] != null) { data[1].addElement(node); @@ -63,7 +63,7 @@ public class Conditional extends Element { } } - @Override + //@Override public void add(String text) { if (data[1] != null) { data[1].addElement(text); @@ -82,7 +82,7 @@ public class Conditional extends Element { } } - @Override + //@Override public String parse(Hashtable params) { if (!params.containsKey(name)) { control_val = false; @@ -139,7 +139,7 @@ public class Conditional extends Element { this.control_val = process_var(control_val); } - @Override + //@Override public String typeOfParam(String param) throws NoSuchElementException { for (Vector element : data) { if (element == null) { diff --git a/src/jd/plugins/optional/webinterface/template/Tmpl/Element/Loop.java b/src/jd/plugins/optional/webinterface/template/Tmpl/Element/Loop.java index 748182f92f..5e0cb19480 100644 --- a/src/jd/plugins/optional/webinterface/template/Tmpl/Element/Loop.java +++ b/src/jd/plugins/optional/webinterface/template/Tmpl/Element/Loop.java @@ -59,17 +59,17 @@ public class Loop extends Element { this.global_vars = global_vars; } - @Override + //@Override public void add(Element node) { data.addElement(node); } - @Override + //@Override public void add(String text) { data.addElement(text); } - @Override + //@Override @SuppressWarnings("unchecked") public String parse(Hashtable p) { if (!p.containsKey(name)) { @@ -155,7 +155,7 @@ public class Loop extends Element { this.control_val = process_var(control_val); } - @Override + //@Override public String typeOfParam(String param) throws NoSuchElementException { for (Object o : data) { if (o.getClass().getName().endsWith(".String")) { diff --git a/src/jd/plugins/optional/webinterface/template/Tmpl/Element/Var.java b/src/jd/plugins/optional/webinterface/template/Tmpl/Element/Var.java index d344b47cb3..93dc23731f 100644 --- a/src/jd/plugins/optional/webinterface/template/Tmpl/Element/Var.java +++ b/src/jd/plugins/optional/webinterface/template/Tmpl/Element/Var.java @@ -78,7 +78,7 @@ public class Var extends Element { } } - @Override + //@Override public String parse(Hashtable params) { String value = null; @@ -120,7 +120,7 @@ public class Var extends Element { } } - @Override + //@Override public String typeOfParam(String param) throws NoSuchElementException { throw new NoSuchElementException(param); } diff --git a/src/jd/router/FindRouterIP.java b/src/jd/router/FindRouterIP.java index 643b9a8ad2..7b08b2010a 100644 --- a/src/jd/router/FindRouterIP.java +++ b/src/jd/router/FindRouterIP.java @@ -51,7 +51,7 @@ public class FindRouterIP { public FindRouterIP(final GUIConfigEntry ip) { new Thread() { - @Override + //@Override public void run() { findIP(ip); } diff --git a/src/jd/router/GetRouterInfo.java b/src/jd/router/GetRouterInfo.java index 643931fb9c..34a0db5cf2 100644 --- a/src/jd/router/GetRouterInfo.java +++ b/src/jd/router/GetRouterInfo.java @@ -515,11 +515,11 @@ public class GetRouterInfo { }; th2.getBroadcaster().addListener(th2.new WorkerListener() { - @Override + //@Override public void onThreadException(Threader th, JDRunnable job, Exception e) { } - @Override + //@Override public void onThreadFinished(Threader th, JDRunnable runnable) { if (runnable == jupnp) { isalv.isAlv = false; @@ -527,7 +527,7 @@ public class GetRouterInfo { } } - @Override + //@Override public void onThreadStarts(Threader threader, JDRunnable runnable) { } @@ -671,11 +671,11 @@ public class GetRouterInfo { th2.getBroadcaster().addListener(th2.new WorkerListener() { - @Override + //@Override public void onThreadException(Threader th, JDRunnable job, Exception e) { } - @Override + //@Override public void onThreadFinished(Threader th, JDRunnable runnable) { if (runnable == jupnp) { isalv.isAlv = false; @@ -683,7 +683,7 @@ public class GetRouterInfo { } } - @Override + //@Override public void onThreadStarts(Threader threader, JDRunnable runnable) { } }); @@ -851,7 +851,7 @@ public class GetRouterInfo { private void setProgress(final int val) { new GuiRunnable(){ - @Override + //@Override public Object runSave() { if (progressBar != null) { progressBar.setValue(val); @@ -879,7 +879,7 @@ public class GetRouterInfo { final ProgressDialog progress = new ProgressDialog(SimpleGUI.CURRENTGUI, JDLocale.L("gui.config.liveHeader.progress.message", "jDownloader sucht nach Ihren Routereinstellungen"), null, false, true); final GetRouterInfo routerInfo = new GetRouterInfo(progress); final Thread th = new Thread() { - @Override + //@Override public void run() { String pw = ""; String username = ""; diff --git a/src/jd/router/RouterData.java b/src/jd/router/RouterData.java index 8c30624cef..eb1ebbe98f 100644 --- a/src/jd/router/RouterData.java +++ b/src/jd/router/RouterData.java @@ -310,7 +310,7 @@ public class RouterData implements Serializable { this.routerPort = routerPort; } - @Override + //@Override public String toString() { return routerName; } diff --git a/src/jd/router/reconnectrecorder/JDRRGui.java b/src/jd/router/reconnectrecorder/JDRRGui.java index 9dbcfae93e..9401d1b8f0 100644 --- a/src/jd/router/reconnectrecorder/JDRRGui.java +++ b/src/jd/router/reconnectrecorder/JDRRGui.java @@ -255,7 +255,7 @@ public class JDRRGui extends JDialog implements ActionListener { return imageGood.getWidth(this); } - @Override + //@Override public void paintComponent(Graphics g) { if (status == 0) { g.drawImage(imageProgress, 0, 0, null); diff --git a/src/jd/utils/JDFileReg.java b/src/jd/utils/JDFileReg.java index 0bf55edd29..aef5703c9f 100644 --- a/src/jd/utils/JDFileReg.java +++ b/src/jd/utils/JDFileReg.java @@ -55,7 +55,7 @@ public class JDFileReg { JDIO.writeLocalFile(JDUtilities.getResourceFile("tmp/installcnl.reg"), "Windows Registry Editor Version 5.00\r\n\r\n\r\n\r\n" + sb.toString()); if (!SubConfiguration.getConfig("CNL2").getBooleanProperty("INSTALLED", false)) { - if (UserIO.getInstance().requestConfirmDialog(UserIO.NO_COUNTDOWN, JDLocale.L("gui.cnl.install.title", "Click'n'Load Installation"), JDLocale.L("gui.cnl.install.text", "Click'n'load is a very comfortable way to add links to JDownloader. \r\nTo install Click'n'Load, JDownloader has to set some registry entries. \r\nYou might have to confirm some Windows messages to continue."), JDTheme.II("gui.clicknload", 48, 48), null, null)) { + if ((UserIO.getInstance().requestConfirmDialog(UserIO.NO_COUNTDOWN, JDLocale.L("gui.cnl.install.title", "Click'n'Load Installation"), JDLocale.L("gui.cnl.install.text", "Click'n'load is a very comfortable way to add links to JDownloader. \r\nTo install Click'n'Load, JDownloader has to set some registry entries. \r\nYou might have to confirm some Windows messages to continue."), JDTheme.II("gui.clicknload", 48, 48), null, null)&UserIO.RETURN_OK)>0) { JDUtilities.runCommand("regedit.exe", new String[] { "installcnl.reg" }, JDUtilities.getResourceFile("tmp").getAbsolutePath(), 600); JDUtilities.runCommand("regedit.exe", new String[] { "/e", "test.reg", "HKEY_CLASSES_ROOT\\.dlc" }, JDUtilities.getResourceFile("tmp").getAbsolutePath(), 600); if (JDUtilities.getResourceFile("tmp/test.reg").exists()) { diff --git a/src/jd/utils/JDSounds.java b/src/jd/utils/JDSounds.java index af01f6a19e..6e568a8332 100644 --- a/src/jd/utils/JDSounds.java +++ b/src/jd/utils/JDSounds.java @@ -104,7 +104,7 @@ public class JDSounds { playing = true; if (threated) { new Thread() { - @Override + //@Override public void run() { JDSounds.playMp3(f); playing = false; diff --git a/src/jd/utils/JDUtilities.java b/src/jd/utils/JDUtilities.java index 65d93e8cfc..3b2f0b0752 100644 --- a/src/jd/utils/JDUtilities.java +++ b/src/jd/utils/JDUtilities.java @@ -637,12 +637,12 @@ public class JDUtilities { ret.append(' '); ret.append(JDUtilities.JD_VERSION); ret.append(JDUtilities.getRevision()); - if (JDUtilities.getController() != null && JDUtilities.getController().getWaitingUpdates() != null && JDUtilities.getController().getWaitingUpdates().size() > 0) { - ret.append(' '); - ret.append(JDLocale.L("gui.mainframe.title.updatemessage", "-->UPDATES VERFÜGBAR:")); - ret.append(' '); - ret.append(JDUtilities.getController().getWaitingUpdates().size()); - } +// if (JDUtilities.getController() != null && JDUtilities.getController().getWaitingUpdates() != null && JDUtilities.getController().getWaitingUpdates().size() > 0) { +// ret.append(' '); +// ret.append(JDLocale.L("gui.mainframe.title.updatemessage", "-->UPDATES VERFÜGBAR:")); +// ret.append(' '); +// ret.append(JDUtilities.getController().getWaitingUpdates().size()); +// } return ret.toString(); } diff --git a/src/sun/net/www/protocol/jdp/Handler.java b/src/sun/net/www/protocol/jdp/Handler.java index 795d08199e..4ddc9c8f26 100644 --- a/src/sun/net/www/protocol/jdp/Handler.java +++ b/src/sun/net/www/protocol/jdp/Handler.java @@ -19,7 +19,7 @@ public class Handler extends sun.net.www.protocol.http.Handler { this.proxyPort = port; } - @Override + //@Override protected URLConnection openConnection(URL u) throws IOException { return openConnection(u, (Proxy) null); diff --git a/src/sun/net/www/protocol/jdps/Handler.java b/src/sun/net/www/protocol/jdps/Handler.java index 0ccf0b4126..a2b4d91b51 100644 --- a/src/sun/net/www/protocol/jdps/Handler.java +++ b/src/sun/net/www/protocol/jdps/Handler.java @@ -18,7 +18,7 @@ public class Handler extends sun.net.www.protocol.https.Handler { this.proxyPort = port; } - @Override + //@Override protected URLConnection openConnection(URL u) throws IOException { return openConnection(u, (Proxy) null); diff --git a/tools/themekeys/themekeys/ThemeKeys.java b/tools/themekeys/themekeys/ThemeKeys.java index 552c3152fa..d43d0b2c57 100644 --- a/tools/themekeys/themekeys/ThemeKeys.java +++ b/tools/themekeys/themekeys/ThemeKeys.java @@ -210,7 +210,7 @@ public class ThemeKeys extends JFrame { return this.getKey().compareToIgnoreCase(o.getKey()); } - @Override + //@Override public String toString() { return this.getKey() + ": " + isInSource() + " ; " + isInTheme(); } @@ -247,7 +247,7 @@ public class ThemeKeys extends JFrame { private final String[] columns = new String[] { "Key", "In Source?", "In Theme?" }; - @Override + //@Override public Class getColumnClass(int col) { if (col == 0) return String.class; return Boolean.class; @@ -261,7 +261,7 @@ public class ThemeKeys extends JFrame { return themeData.size(); } - @Override + //@Override public String getColumnName(int column) { return columns[column]; }