Projects >> plugin-WebOfTrust >>d6e49bf5c0291cf4c089ced29fcec80cf1c233d0

Chunk
Conflicting content 
			if(mOldObject != null && mNewObject != null && !getOldObject().getID().equals(getNewObject().getID()))
				throw new IllegalStateException("The ID of mOldObject and mNewObject must match!");
		}
<<<<<<< HEAD
=======
		
		/**
		 * @deprecated Not implemented because we don't need it.
		 */
		@Override
		@Deprecated()
		public String getID() {
			throw new UnsupportedOperationException();
		}
		
		/**
		 * @return The {@link Subscription} which requested this type of Notification.
		 */
		public Subscription getSubscription() {
			checkedActivate(1);
			mSubscription.initializeTransient(mWebOfTrust);
			return mSubscription;
		}
>>>>>>> efe69542f4b3439ace8cd7fa14c37f8a5914a199

		/**
		 * @return The changed {@link Persistent} object before the change. Null if the change was the creation of the object.
Solution content 
			if(mOldObject != null && mNewObject != null && !getOldObject().getID().equals(getNewObject().getID()))
				throw new IllegalStateException("The ID of mOldObject and mNewObject must match!");
		}

		/**
		 * @return The changed {@link Persistent} object before the change. Null if the change was the creation of the object.
File
SubscriptionManager.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content 
	 */
=======
	@Override
>>>>>>> efe69542f4b3439ace8cd7fa14c37f8a5914a199
	public void terminate() {
		}
	}

<<<<<<< HEAD
	/**
	 * ATTENTION: If you add new code which terminates threads, you must make sure that they are
	 * terminated in {@link AbstractFullNodeTest#setUpNode()} as well.
		Logger.normal(this, "Web Of Trust plugin terminating ...");
Solution content 
		}
	}

	/**
	 * ATTENTION: If you add new code which terminates threads, you must make sure that they are
	 * terminated in {@link AbstractFullNodeTest#setUpNode()} as well.
	 */
	@Override
	public void terminate() {
		Logger.normal(this, "Web Of Trust plugin terminating ...");
File
WebOfTrust.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Comment
Chunk
Conflicting content 
    @Override
    /**
     * Handles FCP messages.

     * Actually implemented at class {@link FCPInterface} at
     * {@link FCPInterface#handlePluginFCPMessage(FCPPluginClient, FCPPluginMessage)}.
     */
		Logger.normal(this, "Web Of Trust plugin terminated.");
	}

<<<<<<< HEAD
    public FCPPluginMessage handlePluginFCPMessage(FCPPluginClient client, FCPPluginMessage message)
    {
        return mFCPInterface.handlePluginFCPMessage(client, message);
    }
=======
	/**
	 * Inherited event handler from FredPluginFCP, handled in class FCPInterface.
	 */
	@Override
	public void handle(PluginReplySender replysender, SimpleFieldSet params, Bucket data, int accesstype) {
		mFCPInterface.handle(replysender, params, data, accesstype);
	}
>>>>>>> efe69542f4b3439ace8cd7fa14c37f8a5914a199

	/**
	 * Loads an own or normal identity from the database, querying on its ID.
Solution content 
		Logger.normal(this, "Web Of Trust plugin terminated.");
	}

    /**
     * Handles FCP messages.

     * Actually implemented at class {@link FCPInterface} at
     * {@link FCPInterface#handlePluginFCPMessage(FCPPluginClient, FCPPluginMessage)}.
     */
    @Override
    public FCPPluginMessage handlePluginFCPMessage(FCPPluginClient client, FCPPluginMessage message)
    {
        return mFCPInterface.handlePluginFCPMessage(client, message);
    }

	/**
	 * Loads an own or normal identity from the database, querying on its ID.
File
WebOfTrust.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content 
	public IntroductionClient getIntroductionClient() {
		return mIntroductionClient;
	}
<<<<<<< HEAD

    public IntroductionServer getIntroductionServer() {
        return mIntroductionServer;
    }

=======
	
	@Override
>>>>>>> efe69542f4b3439ace8cd7fa14c37f8a5914a199
	protected FCPInterface getFCPInterface() {
		return mFCPInterface;
	}
Solution content 
	public IntroductionClient getIntroductionClient() {
		return mIntroductionClient;
	}

    public IntroductionServer getIntroductionServer() {
        return mIntroductionServer;
    }

	@Override
	protected FCPInterface getFCPInterface() {
		return mFCPInterface;
	}
File
WebOfTrust.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
		if(logMINOR) Logger.minor(this, "handleConnectionStatusChanged(" + connected + ")");
	}

<<<<<<< HEAD
	private final class BeginSubscriptionSynchronizationHandlerImpl
	        implements BeginSubscriptionSynchronizationHandler {
	    
        private final Class mClass;
        /** Key = {@link EventSource#getID()} */
        private final Map mDatabase;
	    
	    BeginSubscriptionSynchronizationHandlerImpl(Class myClass, Map myDatabase) {
            mClass = myClass;
            mDatabase = myDatabase;
	    }
=======
	private final class SubscriptionSynchronizationHandlerImpl implements SubscriptionSynchronizationHandler {
		private final Class mClass;
		private final HashMap mTarget;
		
		public SubscriptionSynchronizationHandlerImpl(final Class myClass,
				final HashMap myTarget) {
			mClass = myClass;
			mTarget = myTarget;
		}
		
		/**
		 * Fill our existing "database" (the {@link HashMap} mTarget) with the synchronization of ALL data which we have received from WOT.
		 */
		@Override
		public void handleSubscriptionSynchronization(final Collection source) {
            if(logMINOR) {
                Logger.minor(this, "handleSubscriptionSynchronization() for subscription type: "
                    + mClass);
            }
>>>>>>> efe69542f4b3439ace8cd7fa14c37f8a5914a199

        @Override public void handleBeginSubscriptionSynchronization(final UUID versionID) {
            Logger.minor(this, "handleBeginSubscriptionSynchronization() for subscription type: "
Solution content 
	    }

		if(logMINOR) Logger.minor(this, "handleConnectionStatusChanged(" + connected + ")");
	}

	private final class BeginSubscriptionSynchronizationHandlerImpl
	        implements BeginSubscriptionSynchronizationHandler {
	    
        private final Class mClass;
        /** Key = {@link EventSource#getID()} */
        private final Map mDatabase;
	    
	    BeginSubscriptionSynchronizationHandlerImpl(Class myClass, Map myDatabase) {
            mClass = myClass;
            mDatabase = myDatabase;
        @Override public void handleBeginSubscriptionSynchronization(final UUID versionID) {
            Logger.minor(this, "handleBeginSubscriptionSynchronization() for subscription type: "
File
DebugFCPClient.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Class signature
Comment
If statement
Method declaration
Method signature
Chunk
Conflicting content 
	 * In that case we need to gracefully tell WOT about that: In case of {@link Subscription}'s event {@link Notification}s, it will re-send them then. 
	 */
	private abstract class MaybeFailingFCPMessageHandler implements FCPMessageHandler {
<<<<<<< HEAD
		public void handle(final FCPPluginMessage message) throws ProcessingFailedException {
=======
		@Override
		public void handle(final SimpleFieldSet sfs, final Bucket data) throws ProcessingFailedException {
>>>>>>> efe69542f4b3439ace8cd7fa14c37f8a5914a199
			try {	
				handle_MaybeFailing(message.params, message.data);
			} catch(Throwable t) {
Solution content 
	 * In that case we need to gracefully tell WOT about that: In case of {@link Subscription}'s event {@link Notification}s, it will re-send them then. 
	 */
	private abstract class MaybeFailingFCPMessageHandler implements FCPMessageHandler {
		@Override
		public void handle(final FCPPluginMessage message) throws ProcessingFailedException {
			try {	
				handle_MaybeFailing(message.params, message.data);
			} catch(Throwable t) {
File
FCPClientReferenceImplementation.java
Developer's decision
Combination
Kind of conflict
Annotation
Method signature