goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move mulinks package to core

dbus-notify
Zlatin Balevsky 2022-08-11 13:16:49 +01:00
parent e6e7dbf13d
commit c9669d1fdf
No known key found for this signature in database
GPG Key ID: A72832072D525E41
13 changed files with 24 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/src/main/groovy/com/muwire/gui/mulinks/CollectionMuLink.groovy → core/src/main/groovy/com/muwire/core/mulinks/CollectionMuLink.groovy
View File

@ -1,4 +1,4 @@
package com.muwire.gui.mulinks
package com.muwire.core.mulinks
import com.muwire.core.InfoHash
import com.muwire.core.Persona

3
gui/src/main/groovy/com/muwire/gui/mulinks/FileMuLink.groovy → core/src/main/groovy/com/muwire/core/mulinks/FileMuLink.groovy
View File

@ -1,4 +1,4 @@
package com.muwire.gui.mulinks
package com.muwire.core.mulinks
import com.muwire.core.InfoHash
import com.muwire.core.Persona
@ -8,7 +8,6 @@ import net.i2p.crypto.DSAEngine
import net.i2p.data.SigningPrivateKey
import java.nio.charset.StandardCharsets
import java.nio.file.Path
class FileMuLink extends MuLink {
final long fileSize

2
gui/src/main/groovy/com/muwire/gui/mulinks/InvalidMuLinkException.groovy → core/src/main/groovy/com/muwire/core/mulinks/InvalidMuLinkException.groovy
View File

@ -1,4 +1,4 @@
package com.muwire.gui.mulinks
package com.muwire.core.mulinks
class InvalidMuLinkException extends Exception {
InvalidMuLinkException(String message) {

3
gui/src/main/groovy/com/muwire/gui/mulinks/MuLink.groovy → core/src/main/groovy/com/muwire/core/mulinks/MuLink.groovy
View File

@ -1,4 +1,4 @@
package com.muwire.gui.mulinks
package com.muwire.core.mulinks
import com.muwire.core.Constants
import com.muwire.core.InfoHash
@ -9,7 +9,6 @@ import net.i2p.data.Signature
import net.i2p.data.SigningPublicKey
import java.nio.charset.StandardCharsets
import java.nio.file.Path
abstract class MuLink {

13
gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
View File

@ -6,10 +6,10 @@ import com.muwire.core.files.directories.WatchedDirectory
import com.muwire.core.messenger.UIFolderCreateEvent
import com.muwire.core.messenger.UIFolderDeleteEvent
import com.muwire.gui.MainFrameModel.UploaderWrapper
import com.muwire.gui.mulinks.CollectionMuLink
import com.muwire.gui.mulinks.FileMuLink
import com.muwire.gui.mulinks.InvalidMuLinkException
import com.muwire.gui.mulinks.MuLink
import com.muwire.core.mulinks.CollectionMuLink
import com.muwire.core.mulinks.FileMuLink
import com.muwire.core.mulinks.InvalidMuLinkException
import com.muwire.core.mulinks.MuLink
import com.muwire.gui.profile.PersonaOrProfile
import com.muwire.gui.profile.TrustPOP
import com.muwire.gui.profile.ViewProfileHelper
@ -28,8 +28,6 @@ import net.i2p.data.Base64
import net.i2p.data.Signature
import java.awt.Desktop
import java.awt.Toolkit
import java.awt.datatransfer.StringSelection
import java.awt.event.ActionEvent
import java.nio.charset.StandardCharsets
@ -57,15 +55,12 @@ import com.muwire.core.filefeeds.UIDownloadFeedItemEvent
import com.muwire.core.filefeeds.UIFeedConfigurationEvent
import com.muwire.core.filefeeds.UIFeedDeletedEvent
import com.muwire.core.filefeeds.UIFeedUpdateEvent
import com.muwire.core.filefeeds.UIFilePublishedEvent
import com.muwire.core.filefeeds.UIFileUnpublishedEvent
import com.muwire.core.files.FileUnsharedEvent
import com.muwire.core.search.QueryEvent
import com.muwire.core.search.SearchEvent
import com.muwire.core.trust.RemoteTrustList
import com.muwire.core.trust.TrustEvent
import com.muwire.core.trust.TrustLevel
import com.muwire.core.trust.TrustService.TrustEntry
import com.muwire.core.trust.TrustSubscriptionEvent
import com.muwire.core.upload.HashListUploader
import com.muwire.core.upload.Uploader

13
gui/griffon-app/views/com/muwire/gui/ChatRoomView.groovy
View File

@ -1,30 +1,21 @@
package com.muwire.gui
import com.muwire.core.download.UIDownloadLinkEvent
import com.muwire.core.trust.TrustLevel
import com.muwire.gui.chat.ChatEntry
import com.muwire.gui.chat.ChatEntryPane
import com.muwire.gui.contacts.POPLabel
import com.muwire.gui.mulinks.FileMuLink
import com.muwire.gui.mulinks.MuLink
import com.muwire.core.mulinks.MuLink
import com.muwire.gui.profile.PersonaOrProfile
import com.muwire.gui.profile.PersonaOrProfileCellRenderer
import com.muwire.gui.profile.PersonaOrProfileComparator
import com.muwire.gui.profile.ProfileConstants
import griffon.core.GriffonApplication
import griffon.core.artifact.GriffonView
import griffon.core.mvc.MVCGroup
import javax.inject.Inject
import javax.swing.BorderFactory
import javax.swing.JLabel
import javax.swing.JMenu
import javax.swing.JScrollPane
import javax.swing.border.Border
import javax.swing.text.SimpleAttributeSet
import java.awt.Dimension
import java.text.SimpleDateFormat
import java.util.function.Consumer
import static com.muwire.gui.Translator.trans

6
gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
View File

@ -4,10 +4,9 @@ import com.muwire.core.Persona
import com.muwire.core.messenger.MWMessage
import com.muwire.core.messenger.Messenger
import com.muwire.core.messenger.UIMessageMovedEvent
import com.muwire.core.trust.TrustLevel
import com.muwire.gui.chat.ChatFavorites
import com.muwire.gui.mulinks.FileMuLink
import com.muwire.gui.mulinks.MuLink
import com.muwire.core.mulinks.FileMuLink
import com.muwire.core.mulinks.MuLink
import com.muwire.gui.profile.PersonaOrProfile
import com.muwire.gui.profile.PersonaOrProfileCellRenderer
import com.muwire.gui.profile.PersonaOrProfileComparator
@ -32,7 +31,6 @@ import javax.swing.event.ChangeListener
import javax.swing.tree.DefaultMutableTreeNode
import java.awt.GridBagConstraints
import java.awt.Image
import java.awt.KeyboardFocusManager
import java.awt.TrayIcon
import java.awt.Window
import java.awt.event.ActionEvent

5
gui/src/main/groovy/com/muwire/gui/chat/ChatEntry.groovy
View File

@ -5,9 +5,8 @@ import com.muwire.core.Persona
import com.muwire.core.util.DataUtil
import com.muwire.gui.UISettings
import com.muwire.gui.contacts.POPLabel
import com.muwire.gui.mulinks.FileMuLink
import com.muwire.gui.mulinks.InvalidMuLinkException
import com.muwire.gui.mulinks.MuLink
import com.muwire.core.mulinks.InvalidMuLinkException
import com.muwire.core.mulinks.MuLink
import com.muwire.gui.profile.PersonaOrProfile
import net.i2p.data.Base64

10
gui/src/main/groovy/com/muwire/gui/chat/ChatEntryPane.groovy
View File

@ -3,12 +3,11 @@ package com.muwire.gui.chat
import com.muwire.gui.CopyPasteSupport
import com.muwire.gui.UISettings
import com.muwire.gui.contacts.POPLabel
import com.muwire.gui.mulinks.CollectionMuLink
import com.muwire.gui.mulinks.FileMuLink
import com.muwire.gui.mulinks.InvalidMuLinkException
import com.muwire.gui.mulinks.MuLink
import com.muwire.core.mulinks.CollectionMuLink
import com.muwire.core.mulinks.FileMuLink
import com.muwire.core.mulinks.InvalidMuLinkException
import com.muwire.core.mulinks.MuLink
import com.muwire.gui.profile.PersonaOrProfile
import com.muwire.gui.profile.ProfileConstants
import sun.swing.UIAction
import javax.swing.*
@ -18,7 +17,6 @@ import javax.swing.event.MenuKeyListener
import javax.swing.text.*
import java.awt.*
import java.awt.event.ActionEvent
import java.awt.event.InputEvent
import java.awt.event.KeyAdapter
import java.awt.event.KeyEvent
import java.util.List

2
gui/src/main/groovy/com/muwire/gui/chat/CollectionLinkLabel.groovy
View File

@ -3,7 +3,7 @@ package com.muwire.gui.chat
import com.muwire.gui.HTMLSanitizer
import com.muwire.gui.SizeFormatter
import com.muwire.gui.UISettings
import com.muwire.gui.mulinks.CollectionMuLink
import com.muwire.core.mulinks.CollectionMuLink
import static com.muwire.gui.Translator.trans
class CollectionLinkLabel extends MuLinkLabel {

2
gui/src/main/groovy/com/muwire/gui/chat/FileLinkLabel.groovy
View File

@ -3,7 +3,7 @@ package com.muwire.gui.chat
import com.muwire.gui.HTMLSanitizer
import com.muwire.gui.SizeFormatter
import com.muwire.gui.UISettings
import com.muwire.gui.mulinks.FileMuLink
import com.muwire.core.mulinks.FileMuLink
import static com.muwire.gui.Translator.trans

2
gui/src/main/groovy/com/muwire/gui/chat/MuLinkLabel.groovy
View File

@ -2,7 +2,7 @@ package com.muwire.gui.chat
import com.muwire.gui.UISettings
import com.muwire.gui.mulinks.MuLink
import com.muwire.core.mulinks.MuLink
import javax.swing.*
import javax.swing.border.Border

6
gui/src/main/groovy/com/muwire/gui/chat/MuLinkPanel.groovy
View File

@ -2,9 +2,9 @@ package com.muwire.gui.chat
import com.muwire.gui.CopyPasteSupport
import com.muwire.gui.UISettings
import com.muwire.gui.mulinks.CollectionMuLink
import com.muwire.gui.mulinks.FileMuLink
import com.muwire.gui.mulinks.MuLink
import com.muwire.core.mulinks.CollectionMuLink
import com.muwire.core.mulinks.FileMuLink
import com.muwire.core.mulinks.MuLink
import static com.muwire.gui.Translator.trans