",options:{classes:{},disabled:!1,create:null},_createWidget:function(i,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=e++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),i),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var l=s.match(/^([\w:-]*)\s*(.*)$/),h=l[1]+o.eventNamespace,c=l[2];c?n.on(h,c,r):i.on(h,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,function(){function e(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function i(e,i){return parseInt(t.css(e,i),10)||0}function s(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}var n,o=Math.max,a=Math.abs,r=/left|center|right/,l=/top|center|bottom/,h=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,d=t.fn.position;t.position={scrollbarWidth:function(){if(void 0!==n)return n;var e,i,s=t("
"),o=s.children()[0];return t("body").append(s),e=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,e===i&&(i=s[0].clientWidth),s.remove(),n=e-i},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width
i?"left":e>0?"right":"center",vertical:0>r?"top":s>0?"bottom":"middle"};h>p&&p>a(e+i)&&(u.horizontal="center"),c>f&&f>a(s+r)&&(u.vertical="middle"),u.important=o(a(e),a(i))>o(a(s),a(r))?"horizontal":"vertical",n.using.call(this,t,u)}),l.offset(t.extend(D,{using:r}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,l=n-r,h=r+e.collisionWidth-a-n;e.collisionWidth>a?l>0&&0>=h?(i=t.left+l+e.collisionWidth-a-n,t.left+=l-i):t.left=h>0&&0>=l?n:l>h?n+a-e.collisionWidth:n:l>0?t.left+=l:h>0?t.left-=h:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,l=n-r,h=r+e.collisionHeight-a-n;e.collisionHeight>a?l>0&&0>=h?(i=t.top+l+e.collisionHeight-a-n,t.top+=l-i):t.top=h>0&&0>=l?n:l>h?n+a-e.collisionHeight:n:l>0?t.top+=l:h>0?t.top-=h:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,r=n.width,l=n.isWindow?n.scrollLeft:n.offset.left,h=t.left-e.collisionPosition.marginLeft,c=h-l,u=h+e.collisionWidth-r-l,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-r-o,(0>i||a(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-l,(s>0||u>a(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,r=n.height,l=n.isWindow?n.scrollTop:n.offset.top,h=t.top-e.collisionPosition.marginTop,c=h-l,u=h+e.collisionHeight-r-l,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-r-o,(0>s||a(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-l,(i>0||u>a(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}}}(),t.ui.position,t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.ui.safeActiveElement=function(t){var e;try{e=t.activeElement}catch(i){e=t.body}return e||(e=t.body),e.nodeName||(e=t.body),e},t.widget("ui.menu",{version:"1.12.1",defaultElement:"",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault()},"click .ui-menu-item":function(e){var i=t(e.target),s=t(t.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(e),e.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(e):!this.element.is(":focus")&&s.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){if(!this.previousFilter){var i=t(e.target).closest(".ui-menu-item"),s=t(e.currentTarget);i[0]===s[0]&&(this._removeClass(s.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(e,s))}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.find(this.options.items).eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){var i=!t.contains(this.element[0],t.ui.safeActiveElement(this.document[0]));i&&this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t),this.mouseHandled=!1}})},_destroy:function(){var e=this.element.find(".ui-menu-item").removeAttr("role aria-disabled"),i=e.children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),i.children().each(function(){var e=t(this);e.data("ui-menu-submenu-caret")&&e.remove()})},_keydown:function(e){var i,s,n,o,a=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:a=!1,s=this.previousFilter||"",o=!1,n=e.keyCode>=96&&105>=e.keyCode?""+(e.keyCode-96):String.fromCharCode(e.keyCode),clearTimeout(this.filterTimer),n===s?o=!0:n=s+n,i=this._filterMenuItems(n),i=o&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(e.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(e,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}a&&e.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i,s,n,o,a=this,r=this.options.icons.submenu,l=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),s=l.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),i=e.prev(),s=t("").data("ui-menu-submenu-caret",!0);a._addClass(s,"ui-menu-icon","ui-icon "+r),i.attr("aria-haspopup","true").prepend(s),e.attr("aria-labelledby",i.attr("id"))}),this._addClass(s,"ui-menu","ui-widget ui-widget-content ui-front"),e=l.add(this.element),i=e.find(this.options.items),i.not(".ui-menu-item").each(function(){var e=t(this);a._isDivider(e)&&a._addClass(e,"ui-menu-divider","ui-widget-content")}),n=i.not(".ui-menu-item, .ui-menu-divider"),o=n.children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(n,"ui-menu-item")._addClass(o,"ui-menu-item-wrapper"),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){if("icons"===t){var i=this.element.find(".ui-menu-icon");this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)}this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t+""),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i,s,n;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children(".ui-menu-item-wrapper"),this._addClass(s,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),n=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(n,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.outerHeight(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this._removeClass(s.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(e){return!t(e.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(e),void 0)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items).first())),void 0):(this.next(e),void 0)},_hasScroll:function(){return this.element.outerHeight()",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;this.isMultiLine=o||!a&&this._isContentEditable(this.element),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,void 0;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),void 0):(this._searchTimeout(t),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(t),this._change(t),void 0)}}),this._initSource(),this.menu=t("").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(e){e.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,this.element[0]!==t.ui.safeActiveElement(this.document[0])&&this.element.trigger("focus")})},menufocus:function(e,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,e.originalEvent&&/^mouse/.test(e.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){t(e.target).trigger(e.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",e,{item:n})&&e.originalEvent&&/^key/.test(e.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&t.trim(s).length&&(this.liveRegion.children().hide(),t("").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,i){var s=i.item.data("ui-autocomplete-item"),n=this.previous;this.element[0]!==t.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=n,this._delay(function(){this.previous=n,this.selectedItem=s})),!1!==this._trigger("select",e,{item:s})&&this._value(s.value),this.term=this._value(),this.close(e),this.selectedItem=s}}),this.liveRegion=t("
",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(e){var i=this.menu.element[0];return e.target===this.element[0]||e.target===i||t.contains(i,e.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_initSource:function(){var e,i,s=this;t.isArray(this.options.source)?(e=this.options.source,this.source=function(i,s){s(t.ui.autocomplete.filter(e,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(e,n){s.xhr&&s.xhr.abort(),s.xhr=t.ajax({url:i,data:e,dataType:"json",success:function(t){n(t)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(t){clearTimeout(this.searching),this.searching=this._delay(function(){var e=this.term===this._value(),i=this.menu.element.is(":visible"),s=t.altKey||t.ctrlKey||t.metaKey||t.shiftKey;(!e||e&&!i&&!s)&&(this.selectedItem=null,this.search(null,t))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length
").append(t("").text(i.label)).appendTo(e)},_move:function(t,e){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[t](e),void 0):(this.search(null,e),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),t.extend(t.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(e,i){var s=RegExp(t.ui.autocomplete.escapeRegex(i),"i");return t.grep(e,function(t){return s.test(t.label||t.value||t)})}}),t.widget("ui.autocomplete",t.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(t>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=e&&e.length?this.options.messages.results(e.length):this.options.messages.noResults,this.liveRegion.children().hide(),t("
").text(i).appendTo(this.liveRegion))}}),t.ui.autocomplete});
\ No newline at end of file
diff --git a/docs/script-dir/jquery-ui.structure.min.css b/docs/script-dir/jquery-ui.structure.min.css
deleted file mode 100644
index e8808927..00000000
--- a/docs/script-dir/jquery-ui.structure.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery UI - v1.12.1 - 2018-12-06
-* http://jqueryui.com
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important;pointer-events:none}.ui-icon{display:inline-block;vertical-align:middle;margin-top:-.25em;position:relative;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-icon-block{left:50%;margin-left:-8px;display:block}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:0}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{margin:0;cursor:pointer;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-item-wrapper{position:relative;padding:3px 1em 3px .4em}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item-wrapper{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}
\ No newline at end of file
diff --git a/docs/script.js b/docs/script.js
deleted file mode 100644
index 0765364e..00000000
--- a/docs/script.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
- * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- */
-
-var moduleSearchIndex;
-var packageSearchIndex;
-var typeSearchIndex;
-var memberSearchIndex;
-var tagSearchIndex;
-function loadScripts(doc, tag) {
- createElem(doc, tag, 'search.js');
-
- createElem(doc, tag, 'module-search-index.js');
- createElem(doc, tag, 'package-search-index.js');
- createElem(doc, tag, 'type-search-index.js');
- createElem(doc, tag, 'member-search-index.js');
- createElem(doc, tag, 'tag-search-index.js');
-}
-
-function createElem(doc, tag, path) {
- var script = doc.createElement(tag);
- var scriptElement = doc.getElementsByTagName(tag)[0];
- script.src = pathtoroot + path;
- scriptElement.parentNode.insertBefore(script, scriptElement);
-}
-
-function show(tableId, selected, columns) {
- if (tableId !== selected) {
- document.querySelectorAll('div.' + tableId + ':not(.' + selected + ')')
- .forEach(function(elem) {
- elem.style.display = 'none';
- });
- }
- document.querySelectorAll('div.' + selected)
- .forEach(function(elem, index) {
- elem.style.display = '';
- var isEvenRow = index % (columns * 2) < columns;
- elem.classList.remove(isEvenRow ? oddRowColor : evenRowColor);
- elem.classList.add(isEvenRow ? evenRowColor : oddRowColor);
- });
- updateTabs(tableId, selected);
-}
-
-function updateTabs(tableId, selected) {
- document.querySelector('div#' + tableId +' .summary-table')
- .setAttribute('aria-labelledby', selected);
- document.querySelectorAll('button[id^="' + tableId + '"]')
- .forEach(function(tab, index) {
- if (selected === tab.id || (tableId === selected && index === 0)) {
- tab.className = activeTableTab;
- tab.setAttribute('aria-selected', true);
- tab.setAttribute('tabindex',0);
- } else {
- tab.className = tableTab;
- tab.setAttribute('aria-selected', false);
- tab.setAttribute('tabindex',-1);
- }
- });
-}
-
-function switchTab(e) {
- var selected = document.querySelector('[aria-selected=true]');
- if (selected) {
- if ((e.keyCode === 37 || e.keyCode === 38) && selected.previousSibling) {
- // left or up arrow key pressed: move focus to previous tab
- selected.previousSibling.click();
- selected.previousSibling.focus();
- e.preventDefault();
- } else if ((e.keyCode === 39 || e.keyCode === 40) && selected.nextSibling) {
- // right or down arrow key pressed: move focus to next tab
- selected.nextSibling.click();
- selected.nextSibling.focus();
- e.preventDefault();
- }
- }
-}
-
-var updateSearchResults = function() {};
-
-function indexFilesLoaded() {
- return moduleSearchIndex
- && packageSearchIndex
- && typeSearchIndex
- && memberSearchIndex
- && tagSearchIndex;
-}
-
-// Workaround for scroll position not being included in browser history (8249133)
-document.addEventListener("DOMContentLoaded", function(e) {
- var contentDiv = document.querySelector("div.flex-content");
- window.addEventListener("popstate", function(e) {
- if (e.state !== null) {
- contentDiv.scrollTop = e.state;
- }
- });
- window.addEventListener("hashchange", function(e) {
- history.replaceState(contentDiv.scrollTop, document.title);
- });
- contentDiv.addEventListener("scroll", function(e) {
- var timeoutID;
- if (!timeoutID) {
- timeoutID = setTimeout(function() {
- history.replaceState(contentDiv.scrollTop, document.title);
- timeoutID = null;
- }, 100);
- }
- });
- if (!location.hash) {
- history.replaceState(contentDiv.scrollTop, document.title);
- }
-});
diff --git a/docs/search.js b/docs/search.js
deleted file mode 100644
index 13aba853..00000000
--- a/docs/search.js
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
- * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- *
- */
-
-var noResult = {l: "No results found"};
-var loading = {l: "Loading search index..."};
-var catModules = "Modules";
-var catPackages = "Packages";
-var catTypes = "Classes and Interfaces";
-var catMembers = "Members";
-var catSearchTags = "Search Tags";
-var highlight = "
$& ";
-var searchPattern = "";
-var fallbackPattern = "";
-var RANKING_THRESHOLD = 2;
-var NO_MATCH = 0xffff;
-var MIN_RESULTS = 3;
-var MAX_RESULTS = 500;
-var UNNAMED = "
";
-function escapeHtml(str) {
- return str.replace(//g, ">");
-}
-function getHighlightedText(item, matcher, fallbackMatcher) {
- var escapedItem = escapeHtml(item);
- var highlighted = escapedItem.replace(matcher, highlight);
- if (highlighted === escapedItem) {
- highlighted = escapedItem.replace(fallbackMatcher, highlight)
- }
- return highlighted;
-}
-function getURLPrefix(ui) {
- var urlPrefix="";
- var slash = "/";
- if (ui.item.category === catModules) {
- return ui.item.l + slash;
- } else if (ui.item.category === catPackages && ui.item.m) {
- return ui.item.m + slash;
- } else if (ui.item.category === catTypes || ui.item.category === catMembers) {
- if (ui.item.m) {
- urlPrefix = ui.item.m + slash;
- } else {
- $.each(packageSearchIndex, function(index, item) {
- if (item.m && ui.item.p === item.l) {
- urlPrefix = item.m + slash;
- }
- });
- }
- }
- return urlPrefix;
-}
-function createSearchPattern(term) {
- var pattern = "";
- var isWordToken = false;
- term.replace(/,\s*/g, ", ").trim().split(/\s+/).forEach(function(w, index) {
- if (index > 0) {
- // whitespace between identifiers is significant
- pattern += (isWordToken && /^\w/.test(w)) ? "\\s+" : "\\s*";
- }
- var tokens = w.split(/(?=[A-Z,.()<>[\/])/);
- for (var i = 0; i < tokens.length; i++) {
- var s = tokens[i];
- if (s === "") {
- continue;
- }
- pattern += $.ui.autocomplete.escapeRegex(s);
- isWordToken = /\w$/.test(s);
- if (isWordToken) {
- pattern += "([a-z0-9_$<>\\[\\]]*?)";
- }
- }
- });
- return pattern;
-}
-function createMatcher(pattern, flags) {
- var isCamelCase = /[A-Z]/.test(pattern);
- return new RegExp(pattern, flags + (isCamelCase ? "" : "i"));
-}
-var watermark = 'Search';
-$(function() {
- var search = $("#search-input");
- var reset = $("#reset-button");
- search.val('');
- search.prop("disabled", false);
- reset.prop("disabled", false);
- search.val(watermark).addClass('watermark');
- search.blur(function() {
- if ($(this).val().length === 0) {
- $(this).val(watermark).addClass('watermark');
- }
- });
- search.on('click keydown paste', function() {
- if ($(this).val() === watermark) {
- $(this).val('').removeClass('watermark');
- }
- });
- reset.click(function() {
- search.val('').focus();
- });
- search.focus()[0].setSelectionRange(0, 0);
-});
-$.widget("custom.catcomplete", $.ui.autocomplete, {
- _create: function() {
- this._super();
- this.widget().menu("option", "items", "> :not(.ui-autocomplete-category)");
- },
- _renderMenu: function(ul, items) {
- var rMenu = this;
- var currentCategory = "";
- rMenu.menu.bindings = $();
- $.each(items, function(index, item) {
- var li;
- if (item.category && item.category !== currentCategory) {
- ul.append("" + item.category + " ");
- currentCategory = item.category;
- }
- li = rMenu._renderItemData(ul, item);
- if (item.category) {
- li.attr("aria-label", item.category + " : " + item.l);
- li.attr("class", "result-item");
- } else {
- li.attr("aria-label", item.l);
- li.attr("class", "result-item");
- }
- });
- },
- _renderItem: function(ul, item) {
- var label = "";
- var matcher = createMatcher(escapeHtml(searchPattern), "g");
- var fallbackMatcher = new RegExp(fallbackPattern, "gi")
- if (item.category === catModules) {
- label = getHighlightedText(item.l, matcher, fallbackMatcher);
- } else if (item.category === catPackages) {
- label = getHighlightedText(item.l, matcher, fallbackMatcher);
- } else if (item.category === catTypes) {
- label = (item.p && item.p !== UNNAMED)
- ? getHighlightedText(item.p + "." + item.l, matcher, fallbackMatcher)
- : getHighlightedText(item.l, matcher, fallbackMatcher);
- } else if (item.category === catMembers) {
- label = (item.p && item.p !== UNNAMED)
- ? getHighlightedText(item.p + "." + item.c + "." + item.l, matcher, fallbackMatcher)
- : getHighlightedText(item.c + "." + item.l, matcher, fallbackMatcher);
- } else if (item.category === catSearchTags) {
- label = getHighlightedText(item.l, matcher, fallbackMatcher);
- } else {
- label = item.l;
- }
- var li = $(" ").appendTo(ul);
- var div = $("
").appendTo(li);
- if (item.category === catSearchTags && item.h) {
- if (item.d) {
- div.html(label + " (" + item.h + ") "
- + item.d + " ");
- } else {
- div.html(label + " (" + item.h + ") ");
- }
- } else {
- if (item.m) {
- div.html(item.m + "/" + label);
- } else {
- div.html(label);
- }
- }
- return li;
- }
-});
-function rankMatch(match, category) {
- if (!match) {
- return NO_MATCH;
- }
- var index = match.index;
- var input = match.input;
- var leftBoundaryMatch = 2;
- var periferalMatch = 0;
- // make sure match is anchored on a left word boundary
- if (index === 0 || /\W/.test(input[index - 1]) || "_" === input[index]) {
- leftBoundaryMatch = 0;
- } else if ("_" === input[index - 1] || (input[index] === input[index].toUpperCase() && !/^[A-Z0-9_$]+$/.test(input))) {
- leftBoundaryMatch = 1;
- }
- var matchEnd = index + match[0].length;
- var leftParen = input.indexOf("(");
- var endOfName = leftParen > -1 ? leftParen : input.length;
- // exclude peripheral matches
- if (category !== catModules && category !== catSearchTags) {
- var delim = category === catPackages ? "/" : ".";
- if (leftParen > -1 && leftParen < index) {
- periferalMatch += 2;
- } else if (input.lastIndexOf(delim, endOfName) >= matchEnd) {
- periferalMatch += 2;
- }
- }
- var delta = match[0].length === endOfName ? 0 : 1; // rank full match higher than partial match
- for (var i = 1; i < match.length; i++) {
- // lower ranking if parts of the name are missing
- if (match[i])
- delta += match[i].length;
- }
- if (category === catTypes) {
- // lower ranking if a type name contains unmatched camel-case parts
- if (/[A-Z]/.test(input.substring(matchEnd)))
- delta += 5;
- if (/[A-Z]/.test(input.substring(0, index)))
- delta += 5;
- }
- return leftBoundaryMatch + periferalMatch + (delta / 200);
-
-}
-function doSearch(request, response) {
- var result = [];
- searchPattern = createSearchPattern(request.term);
- fallbackPattern = createSearchPattern(request.term.toLowerCase());
- if (searchPattern === "") {
- return this.close();
- }
- var camelCaseMatcher = createMatcher(searchPattern, "");
- var fallbackMatcher = new RegExp(fallbackPattern, "i");
-
- function searchIndexWithMatcher(indexArray, matcher, category, nameFunc) {
- if (indexArray) {
- var newResults = [];
- $.each(indexArray, function (i, item) {
- item.category = category;
- var ranking = rankMatch(matcher.exec(nameFunc(item)), category);
- if (ranking < RANKING_THRESHOLD) {
- newResults.push({ranking: ranking, item: item});
- }
- return newResults.length <= MAX_RESULTS;
- });
- return newResults.sort(function(e1, e2) {
- return e1.ranking - e2.ranking;
- }).map(function(e) {
- return e.item;
- });
- }
- return [];
- }
- function searchIndex(indexArray, category, nameFunc) {
- var primaryResults = searchIndexWithMatcher(indexArray, camelCaseMatcher, category, nameFunc);
- result = result.concat(primaryResults);
- if (primaryResults.length <= MIN_RESULTS && !camelCaseMatcher.ignoreCase) {
- var secondaryResults = searchIndexWithMatcher(indexArray, fallbackMatcher, category, nameFunc);
- result = result.concat(secondaryResults.filter(function (item) {
- return primaryResults.indexOf(item) === -1;
- }));
- }
- }
-
- searchIndex(moduleSearchIndex, catModules, function(item) { return item.l; });
- searchIndex(packageSearchIndex, catPackages, function(item) {
- return (item.m && request.term.indexOf("/") > -1)
- ? (item.m + "/" + item.l) : item.l;
- });
- searchIndex(typeSearchIndex, catTypes, function(item) {
- return request.term.indexOf(".") > -1 ? item.p + "." + item.l : item.l;
- });
- searchIndex(memberSearchIndex, catMembers, function(item) {
- return request.term.indexOf(".") > -1
- ? item.p + "." + item.c + "." + item.l : item.l;
- });
- searchIndex(tagSearchIndex, catSearchTags, function(item) { return item.l; });
-
- if (!indexFilesLoaded()) {
- updateSearchResults = function() {
- doSearch(request, response);
- }
- result.unshift(loading);
- } else {
- updateSearchResults = function() {};
- }
- response(result);
-}
-$(function() {
- $("#search-input").catcomplete({
- minLength: 1,
- delay: 300,
- source: doSearch,
- response: function(event, ui) {
- if (!ui.content.length) {
- ui.content.push(noResult);
- } else {
- $("#search-input").empty();
- }
- },
- autoFocus: true,
- focus: function(event, ui) {
- return false;
- },
- position: {
- collision: "flip"
- },
- select: function(event, ui) {
- if (ui.item.category) {
- var url = getURLPrefix(ui);
- if (ui.item.category === catModules) {
- url += "module-summary.html";
- } else if (ui.item.category === catPackages) {
- if (ui.item.u) {
- url = ui.item.u;
- } else {
- url += ui.item.l.replace(/\./g, '/') + "/package-summary.html";
- }
- } else if (ui.item.category === catTypes) {
- if (ui.item.u) {
- url = ui.item.u;
- } else if (ui.item.p === UNNAMED) {
- url += ui.item.l + ".html";
- } else {
- url += ui.item.p.replace(/\./g, '/') + "/" + ui.item.l + ".html";
- }
- } else if (ui.item.category === catMembers) {
- if (ui.item.p === UNNAMED) {
- url += ui.item.c + ".html" + "#";
- } else {
- url += ui.item.p.replace(/\./g, '/') + "/" + ui.item.c + ".html" + "#";
- }
- if (ui.item.u) {
- url += ui.item.u;
- } else {
- url += ui.item.l;
- }
- } else if (ui.item.category === catSearchTags) {
- url += ui.item.u;
- }
- if (top !== window) {
- parent.classFrame.location = pathtoroot + url;
- } else {
- window.location.href = pathtoroot + url;
- }
- $("#search-input").focus();
- }
- }
- });
-});
diff --git a/docs/stylesheet.css b/docs/stylesheet.css
deleted file mode 100644
index 836c62da..00000000
--- a/docs/stylesheet.css
+++ /dev/null
@@ -1,865 +0,0 @@
-/*
- * Javadoc style sheet
- */
-
-@import url('resources/fonts/dejavu.css');
-
-/*
- * Styles for individual HTML elements.
- *
- * These are styles that are specific to individual HTML elements. Changing them affects the style of a particular
- * HTML element throughout the page.
- */
-
-body {
- background-color:#ffffff;
- color:#353833;
- font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
- font-size:14px;
- margin:0;
- padding:0;
- height:100%;
- width:100%;
-}
-iframe {
- margin:0;
- padding:0;
- height:100%;
- width:100%;
- overflow-y:scroll;
- border:none;
-}
-a:link, a:visited {
- text-decoration:none;
- color:#4A6782;
-}
-a[href]:hover, a[href]:focus {
- text-decoration:none;
- color:#bb7a2a;
-}
-a[name] {
- color:#353833;
-}
-pre {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
-}
-h1 {
- font-size:20px;
-}
-h2 {
- font-size:18px;
-}
-h3 {
- font-size:16px;
-}
-h4 {
- font-size:15px;
-}
-h5 {
- font-size:14px;
-}
-h6 {
- font-size:13px;
-}
-ul {
- list-style-type:disc;
-}
-code, tt {
- font-family:'DejaVu Sans Mono', monospace;
-}
-:not(h1, h2, h3, h4, h5, h6) > code,
-:not(h1, h2, h3, h4, h5, h6) > tt {
- font-size:14px;
- padding-top:4px;
- margin-top:8px;
- line-height:1.4em;
-}
-dt code {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
- padding-top:4px;
-}
-.summary-table dt code {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
- vertical-align:top;
- padding-top:4px;
-}
-sup {
- font-size:8px;
-}
-button {
- font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif;
- font-size: 14px;
-}
-/*
- * Styles for HTML generated by javadoc.
- *
- * These are style classes that are used by the standard doclet to generate HTML documentation.
- */
-
-/*
- * Styles for document title and copyright.
- */
-.clear {
- clear:both;
- height:0;
- overflow:hidden;
-}
-.about-language {
- float:right;
- padding:0 21px 8px 8px;
- font-size:11px;
- margin-top:-9px;
- height:2.9em;
-}
-.legal-copy {
- margin-left:.5em;
-}
-.tab {
- background-color:#0066FF;
- color:#ffffff;
- padding:8px;
- width:5em;
- font-weight:bold;
-}
-/*
- * Styles for navigation bar.
- */
-@media screen {
- .flex-box {
- position:fixed;
- display:flex;
- flex-direction:column;
- height: 100%;
- width: 100%;
- }
- .flex-header {
- flex: 0 0 auto;
- }
- .flex-content {
- flex: 1 1 auto;
- overflow-y: auto;
- }
-}
-.top-nav {
- background-color:#4D7A97;
- color:#FFFFFF;
- float:left;
- padding:0;
- width:100%;
- clear:right;
- min-height:2.8em;
- padding-top:10px;
- overflow:hidden;
- font-size:12px;
-}
-.sub-nav {
- background-color:#dee3e9;
- float:left;
- width:100%;
- overflow:hidden;
- font-size:12px;
-}
-.sub-nav div {
- clear:left;
- float:left;
- padding:0 0 5px 6px;
- text-transform:uppercase;
-}
-.sub-nav .nav-list {
- padding-top:5px;
-}
-ul.nav-list {
- display:block;
- margin:0 25px 0 0;
- padding:0;
-}
-ul.sub-nav-list {
- float:left;
- margin:0 25px 0 0;
- padding:0;
-}
-ul.nav-list li {
- list-style:none;
- float:left;
- padding: 5px 6px;
- text-transform:uppercase;
-}
-.sub-nav .nav-list-search {
- float:right;
- margin:0 0 0 0;
- padding:5px 6px;
- clear:none;
-}
-.nav-list-search label {
- position:relative;
- right:-16px;
-}
-ul.sub-nav-list li {
- list-style:none;
- float:left;
- padding-top:10px;
-}
-.top-nav a:link, .top-nav a:active, .top-nav a:visited {
- color:#FFFFFF;
- text-decoration:none;
- text-transform:uppercase;
-}
-.top-nav a:hover {
- text-decoration:none;
- color:#bb7a2a;
- text-transform:uppercase;
-}
-.nav-bar-cell1-rev {
- background-color:#F8981D;
- color:#253441;
- margin: auto 5px;
-}
-.skip-nav {
- position:absolute;
- top:auto;
- left:-9999px;
- overflow:hidden;
-}
-/*
- * Hide navigation links and search box in print layout
- */
-@media print {
- ul.nav-list, div.sub-nav {
- display:none;
- }
-}
-/*
- * Styles for page header and footer.
- */
-.title {
- color:#2c4557;
- margin:10px 0;
-}
-.sub-title {
- margin:5px 0 0 0;
-}
-.header ul {
- margin:0 0 15px 0;
- padding:0;
-}
-.header ul li, .footer ul li {
- list-style:none;
- font-size:13px;
-}
-/*
- * Styles for headings.
- */
-body.class-declaration-page .summary h2,
-body.class-declaration-page .details h2,
-body.class-use-page h2,
-body.module-declaration-page .block-list h2 {
- font-style: italic;
- padding:0;
- margin:15px 0;
-}
-body.class-declaration-page .summary h3,
-body.class-declaration-page .details h3,
-body.class-declaration-page .summary .inherited-list h2 {
- background-color:#dee3e9;
- border:1px solid #d0d9e0;
- margin:0 0 6px -8px;
- padding:7px 5px;
-}
-/*
- * Styles for page layout containers.
- */
-main {
- clear:both;
- padding:10px 20px;
- position:relative;
-}
-dl.notes > dt {
- font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif;
- font-size:12px;
- font-weight:bold;
- margin:10px 0 0 0;
- color:#4E4E4E;
-}
-dl.notes > dd {
- margin:5px 10px 10px 0;
- font-size:14px;
- font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
-}
-dl.name-value > dt {
- margin-left:1px;
- font-size:1.1em;
- display:inline;
- font-weight:bold;
-}
-dl.name-value > dd {
- margin:0 0 0 1px;
- font-size:1.1em;
- display:inline;
-}
-/*
- * Styles for lists.
- */
-li.circle {
- list-style:circle;
-}
-ul.horizontal li {
- display:inline;
- font-size:0.9em;
-}
-div.inheritance {
- margin:0;
- padding:0;
-}
-div.inheritance div.inheritance {
- margin-left:2em;
-}
-ul.block-list,
-ul.details-list,
-ul.member-list,
-ul.summary-list {
- margin:10px 0 10px 0;
- padding:0;
-}
-ul.block-list > li,
-ul.details-list > li,
-ul.member-list > li,
-ul.summary-list > li {
- list-style:none;
- margin-bottom:15px;
- line-height:1.4;
-}
-.summary-table dl, .summary-table dl dt, .summary-table dl dd {
- margin-top:0;
- margin-bottom:1px;
-}
-ul.see-list, ul.see-list-long {
- padding-left: 0;
- list-style: none;
-}
-ul.see-list li {
- display: inline;
-}
-ul.see-list li:not(:last-child):after,
-ul.see-list-long li:not(:last-child):after {
- content: ", ";
- white-space: pre-wrap;
-}
-/*
- * Styles for tables.
- */
-.summary-table, .details-table {
- width:100%;
- border-spacing:0;
- border-left:1px solid #EEE;
- border-right:1px solid #EEE;
- border-bottom:1px solid #EEE;
- padding:0;
-}
-.caption {
- position:relative;
- text-align:left;
- background-repeat:no-repeat;
- color:#253441;
- font-weight:bold;
- clear:none;
- overflow:hidden;
- padding:0;
- padding-top:10px;
- padding-left:1px;
- margin:0;
- white-space:pre;
-}
-.caption a:link, .caption a:visited {
- color:#1f389c;
-}
-.caption a:hover,
-.caption a:active {
- color:#FFFFFF;
-}
-.caption span {
- white-space:nowrap;
- padding-top:5px;
- padding-left:12px;
- padding-right:12px;
- padding-bottom:7px;
- display:inline-block;
- float:left;
- background-color:#F8981D;
- border: none;
- height:16px;
-}
-div.table-tabs {
- padding:10px 0 0 1px;
- margin:0;
-}
-div.table-tabs > button {
- border: none;
- cursor: pointer;
- padding: 5px 12px 7px 12px;
- font-weight: bold;
- margin-right: 3px;
-}
-div.table-tabs > button.active-table-tab {
- background: #F8981D;
- color: #253441;
-}
-div.table-tabs > button.table-tab {
- background: #4D7A97;
- color: #FFFFFF;
-}
-.two-column-summary {
- display: grid;
- grid-template-columns: minmax(15%, max-content) minmax(15%, auto);
-}
-.three-column-summary {
- display: grid;
- grid-template-columns: minmax(10%, max-content) minmax(15%, max-content) minmax(15%, auto);
-}
-.four-column-summary {
- display: grid;
- grid-template-columns: minmax(10%, max-content) minmax(10%, max-content) minmax(10%, max-content) minmax(10%, auto);
-}
-@media screen and (max-width: 600px) {
- .two-column-summary {
- display: grid;
- grid-template-columns: 1fr;
- }
-}
-@media screen and (max-width: 800px) {
- .three-column-summary {
- display: grid;
- grid-template-columns: minmax(10%, max-content) minmax(25%, auto);
- }
- .three-column-summary .col-last {
- grid-column-end: span 2;
- }
-}
-@media screen and (max-width: 1000px) {
- .four-column-summary {
- display: grid;
- grid-template-columns: minmax(15%, max-content) minmax(15%, auto);
- }
-}
-.summary-table > div, .details-table > div {
- text-align:left;
- padding: 8px 3px 3px 7px;
-}
-.col-first, .col-second, .col-last, .col-constructor-name, .col-summary-item-name {
- vertical-align:top;
- padding-right:0;
- padding-top:8px;
- padding-bottom:3px;
-}
-.table-header {
- background:#dee3e9;
- font-weight: bold;
-}
-.col-first, .col-first {
- font-size:13px;
-}
-.col-second, .col-second, .col-last, .col-constructor-name, .col-summary-item-name, .col-last {
- font-size:13px;
-}
-.col-first, .col-second, .col-constructor-name {
- vertical-align:top;
- overflow: auto;
-}
-.col-last {
- white-space:normal;
-}
-.col-first a:link, .col-first a:visited,
-.col-second a:link, .col-second a:visited,
-.col-first a:link, .col-first a:visited,
-.col-second a:link, .col-second a:visited,
-.col-constructor-name a:link, .col-constructor-name a:visited,
-.col-summary-item-name a:link, .col-summary-item-name a:visited,
-.constant-values-container a:link, .constant-values-container a:visited,
-.all-classes-container a:link, .all-classes-container a:visited,
-.all-packages-container a:link, .all-packages-container a:visited {
- font-weight:bold;
-}
-.table-sub-heading-color {
- background-color:#EEEEFF;
-}
-.even-row-color, .even-row-color .table-header {
- background-color:#FFFFFF;
-}
-.odd-row-color, .odd-row-color .table-header {
- background-color:#EEEEEF;
-}
-/*
- * Styles for contents.
- */
-.deprecated-content {
- margin:0;
- padding:10px 0;
-}
-div.block {
- font-size:14px;
- font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
-}
-.col-last div {
- padding-top:0;
-}
-.col-last a {
- padding-bottom:3px;
-}
-.module-signature,
-.package-signature,
-.type-signature,
-.member-signature {
- font-family:'DejaVu Sans Mono', monospace;
- font-size:14px;
- margin:14px 0;
- white-space: pre-wrap;
-}
-.module-signature,
-.package-signature,
-.type-signature {
- margin-top: 0;
-}
-.member-signature .type-parameters-long,
-.member-signature .parameters,
-.member-signature .exceptions {
- display: inline-block;
- vertical-align: top;
- white-space: pre;
-}
-.member-signature .type-parameters {
- white-space: normal;
-}
-/*
- * Styles for formatting effect.
- */
-.source-line-no {
- color:green;
- padding:0 30px 0 0;
-}
-h1.hidden {
- visibility:hidden;
- overflow:hidden;
- font-size:10px;
-}
-.block {
- display:block;
- margin:0 10px 5px 0;
- color:#474747;
-}
-.deprecated-label, .descfrm-type-label, .implementation-label, .member-name-label, .member-name-link,
-.module-label-in-package, .module-label-in-type, .override-specify-label, .package-label-in-type,
-.package-hierarchy-label, .type-name-label, .type-name-link, .search-tag-link, .preview-label {
- font-weight:bold;
-}
-.deprecation-comment, .help-footnote, .preview-comment {
- font-style:italic;
-}
-.deprecation-block {
- font-size:14px;
- font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
- border-style:solid;
- border-width:thin;
- border-radius:10px;
- padding:10px;
- margin-bottom:10px;
- margin-right:10px;
- display:inline-block;
-}
-.preview-block {
- font-size:14px;
- font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
- border-style:solid;
- border-width:thin;
- border-radius:10px;
- padding:10px;
- margin-bottom:10px;
- margin-right:10px;
- display:inline-block;
-}
-div.block div.deprecation-comment {
- font-style:normal;
-}
-/*
- * Styles specific to HTML5 elements.
- */
-main, nav, header, footer, section {
- display:block;
-}
-/*
- * Styles for javadoc search.
- */
-.ui-autocomplete-category {
- font-weight:bold;
- font-size:15px;
- padding:7px 0 7px 3px;
- background-color:#4D7A97;
- color:#FFFFFF;
-}
-.result-item {
- font-size:13px;
-}
-.ui-autocomplete {
- max-height:85%;
- max-width:65%;
- overflow-y:scroll;
- overflow-x:scroll;
- white-space:nowrap;
- box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
-}
-ul.ui-autocomplete {
- position:fixed;
- z-index:999999;
-}
-ul.ui-autocomplete li {
- float:left;
- clear:both;
- width:100%;
-}
-.result-highlight {
- font-weight:bold;
-}
-#search-input {
- background-image:url('resources/glass.png');
- background-size:13px;
- background-repeat:no-repeat;
- background-position:2px 3px;
- padding-left:20px;
- position:relative;
- right:-18px;
- width:400px;
-}
-#reset-button {
- background-color: rgb(255,255,255);
- background-image:url('resources/x.png');
- background-position:center;
- background-repeat:no-repeat;
- background-size:12px;
- border:0 none;
- width:16px;
- height:16px;
- position:relative;
- left:-4px;
- top:-4px;
- font-size:0px;
-}
-.watermark {
- color:#545454;
-}
-.search-tag-desc-result {
- font-style:italic;
- font-size:11px;
-}
-.search-tag-holder-result {
- font-style:italic;
- font-size:12px;
-}
-.search-tag-result:target {
- background-color:yellow;
-}
-.module-graph span {
- display:none;
- position:absolute;
-}
-.module-graph:hover span {
- display:block;
- margin: -100px 0 0 100px;
- z-index: 1;
-}
-.inherited-list {
- margin: 10px 0 10px 0;
-}
-section.class-description {
- line-height: 1.4;
-}
-.summary section[class$="-summary"], .details section[class$="-details"],
-.class-uses .detail, .serialized-class-details {
- padding: 0px 20px 5px 10px;
- border: 1px solid #ededed;
- background-color: #f8f8f8;
-}
-.inherited-list, section[class$="-details"] .detail {
- padding:0 0 5px 8px;
- background-color:#ffffff;
- border:none;
-}
-.vertical-separator {
- padding: 0 5px;
-}
-ul.help-section-list {
- margin: 0;
-}
-ul.help-subtoc > li {
- display: inline-block;
- padding-right: 5px;
- font-size: smaller;
-}
-ul.help-subtoc > li::before {
- content: "\2022" ;
- padding-right:2px;
-}
-span.help-note {
- font-style: italic;
-}
-/*
- * Indicator icon for external links.
- */
-main a[href*="://"]::after {
- content:"";
- display:inline-block;
- background-image:url('data:image/svg+xml; utf8, \
- \
- \
- ');
- background-size:100% 100%;
- width:7px;
- height:7px;
- margin-left:2px;
- margin-bottom:4px;
-}
-main a[href*="://"]:hover::after,
-main a[href*="://"]:focus::after {
- background-image:url('data:image/svg+xml; utf8, \
- \
- \
- ');
-}
-
-/*
- * Styles for user-provided tables.
- *
- * borderless:
- * No borders, vertical margins, styled caption.
- * This style is provided for use with existing doc comments.
- * In general, borderless tables should not be used for layout purposes.
- *
- * plain:
- * Plain borders around table and cells, vertical margins, styled caption.
- * Best for small tables or for complex tables for tables with cells that span
- * rows and columns, when the "striped" style does not work well.
- *
- * striped:
- * Borders around the table and vertical borders between cells, striped rows,
- * vertical margins, styled caption.
- * Best for tables that have a header row, and a body containing a series of simple rows.
- */
-
-table.borderless,
-table.plain,
-table.striped {
- margin-top: 10px;
- margin-bottom: 10px;
-}
-table.borderless > caption,
-table.plain > caption,
-table.striped > caption {
- font-weight: bold;
- font-size: smaller;
-}
-table.borderless th, table.borderless td,
-table.plain th, table.plain td,
-table.striped th, table.striped td {
- padding: 2px 5px;
-}
-table.borderless,
-table.borderless > thead > tr > th, table.borderless > tbody > tr > th, table.borderless > tr > th,
-table.borderless > thead > tr > td, table.borderless > tbody > tr > td, table.borderless > tr > td {
- border: none;
-}
-table.borderless > thead > tr, table.borderless > tbody > tr, table.borderless > tr {
- background-color: transparent;
-}
-table.plain {
- border-collapse: collapse;
- border: 1px solid black;
-}
-table.plain > thead > tr, table.plain > tbody tr, table.plain > tr {
- background-color: transparent;
-}
-table.plain > thead > tr > th, table.plain > tbody > tr > th, table.plain > tr > th,
-table.plain > thead > tr > td, table.plain > tbody > tr > td, table.plain > tr > td {
- border: 1px solid black;
-}
-table.striped {
- border-collapse: collapse;
- border: 1px solid black;
-}
-table.striped > thead {
- background-color: #E3E3E3;
-}
-table.striped > thead > tr > th, table.striped > thead > tr > td {
- border: 1px solid black;
-}
-table.striped > tbody > tr:nth-child(even) {
- background-color: #EEE
-}
-table.striped > tbody > tr:nth-child(odd) {
- background-color: #FFF
-}
-table.striped > tbody > tr > th, table.striped > tbody > tr > td {
- border-left: 1px solid black;
- border-right: 1px solid black;
-}
-table.striped > tbody > tr > th {
- font-weight: normal;
-}
-/**
- * Tweak font sizes and paddings for small screens.
- */
-@media screen and (max-width: 1050px) {
- #search-input {
- width: 300px;
- }
-}
-@media screen and (max-width: 800px) {
- #search-input {
- width: 200px;
- }
- .top-nav,
- .bottom-nav {
- font-size: 11px;
- padding-top: 6px;
- }
- .sub-nav {
- font-size: 11px;
- }
- .about-language {
- padding-right: 16px;
- }
- ul.nav-list li,
- .sub-nav .nav-list-search {
- padding: 6px;
- }
- ul.sub-nav-list li {
- padding-top: 5px;
- }
- main {
- padding: 10px;
- }
- .summary section[class$="-summary"], .details section[class$="-details"],
- .class-uses .detail, .serialized-class-details {
- padding: 0 8px 5px 8px;
- }
- body {
- -webkit-text-size-adjust: none;
- }
-}
-@media screen and (max-width: 500px) {
- #search-input {
- width: 150px;
- }
- .top-nav,
- .bottom-nav {
- font-size: 10px;
- }
- .sub-nav {
- font-size: 10px;
- }
- .about-language {
- font-size: 10px;
- padding-right: 12px;
- }
-}
diff --git a/docs/tag-search-index.js b/docs/tag-search-index.js
deleted file mode 100644
index f2a440c7..00000000
--- a/docs/tag-search-index.js
+++ /dev/null
@@ -1 +0,0 @@
-tagSearchIndex = [{"l":"Constant Field Values","h":"","u":"constant-values.html"}];updateSearchResults();
\ No newline at end of file
diff --git a/docs/type-search-index.js b/docs/type-search-index.js
deleted file mode 100644
index 7b85c33b..00000000
--- a/docs/type-search-index.js
+++ /dev/null
@@ -1 +0,0 @@
-typeSearchIndex = [{"p":"fr.inria.verveine.extractor.java","l":"AbstractDictionary"},{"p":"org.moosetechnology.model.famixjava.moose","l":"AbstractGroup"},{"p":"fr.inria.verveine.extractor.java.visitors.refvisitors","l":"AbstractRefVisitor"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Access"},{"l":"All Classes and Interfaces","u":"allclasses-index.html"},{"p":"fr.inria.verveine.extractor.java","l":"VerveineJOptions.AnchorOptions"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"AnnotationInstance"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"AnnotationInstanceAttribute"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"AnnotationInstanceGroup"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"AnnotationType"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"AnnotationTypeAttribute"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"AnnotationTypeGroup"},{"p":"org.moosetechnology.model.famixjava.tagging","l":"Association"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Attribute"},{"p":"org.moosetechnology.model.famixjava.tagging","l":"Category"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Class"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"ClassGroup"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Comment"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"ContainerEntity"},{"p":"fr.inria.verveine.extractor.java.utils","l":"NodeTypeChecker.ENodeTypes"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Entity"},{"p":"org.moosetechnology.model.famixjava.moose","l":"Entity"},{"p":"org.moosetechnology.model.famixjava.tagging","l":"EntityAssociation"},{"p":"fr.inria.verveine.extractor.java.utils","l":"EntityStack"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Enum"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"EnumValue"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Exception"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"FamixJavaEntitiesModel"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"FamixJavaModel"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"FamixModel"},{"p":"org.moosetechnology.model.famixjava.famixreplication","l":"FamixReplicationModel"},{"p":"fr.inria.verveine.extractor.java","l":"FamixRequestor"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"FamixTraitsModel"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"File"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"FileGroup"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Folder"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"FolderGroup"},{"p":"fr.inria.verveine.extractor.java.visitors","l":"GetVisitedEntityAbstractVisitor"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"GlobalVariableGroup"},{"p":"org.moosetechnology.model.famixjava.moose","l":"Group"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Implementation"},{"p":"fr.inria.verveine.extractor.java.utils","l":"ImplicitVarBinding"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"ImplicitVariable"},{"p":"fr.inria.verveine.extractor.java","l":"AbstractDictionary.ImplicitVars"},{"p":"fr.inria.verveine.extractor.java.utils","l":"ImplicitVarBinding.ImplicitVars"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"IndexedFileAnchor"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Inheritance"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Interface"},{"p":"org.moosetechnology.model.famixjava.tagging","l":"IntervalAssociation"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Invocation"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"InvocationGroup"},{"p":"fr.inria.verveine.extractor.java","l":"JavaDictionary"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"LocalVariable"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Method"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"MethodGroup"},{"p":"org.moosetechnology.model.famixjava.moose","l":"Model"},{"p":"org.moosetechnology.model.famixjava.moose","l":"MooseModel"},{"p":"org.moosetechnology.model.famixjava.moosequery","l":"MooseQueryModel"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"NamedEntity"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"NamespaceGroup"},{"p":"fr.inria.verveine.extractor.java.utils","l":"NodeTypeChecker"},{"p":"fr.inria.verveine.extractor.java.utils","l":"NonCloseablePrintStream"},{"p":"org.moosetechnology.model.famixjava.moose","l":"Object"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Package"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"PackageGroup"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Parameter"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"ParameterizableClass"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"ParameterizableInterface"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"ParameterizedType"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"ParameterType"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"PrimitiveType"},{"p":"org.moosetechnology.model.famixjava.moose","l":"PropertyGroup"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Reference"},{"p":"org.moosetechnology.model.famixjava.famixreplication","l":"Replica"},{"p":"org.moosetechnology.model.famixjava.famixreplication","l":"ReplicatedFragment"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"SourceAnchor"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"SourcedEntity"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"SourceLanguage"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"SourceTextAnchor"},{"p":"org.moosetechnology.model.famixjava.moose","l":"SpecializedGroup"},{"p":"fr.inria.verveine.extractor.java.utils","l":"StructuralEntityKinds"},{"p":"fr.inria.verveine.extractor.java.utils","l":"StubBinding"},{"p":"fr.inria.verveine.extractor.java.visitors","l":"SummarizingClassesAbstractVisitor"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TAccess"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TAccessible"},{"p":"org.moosetechnology.model.famixjava.tagging","l":"Tag"},{"p":"org.moosetechnology.model.famixjava.tagging","l":"TaggingModel"},{"p":"org.moosetechnology.model.famixjava.tagging","l":"TagModel"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TAnnotationInstance"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TAnnotationInstanceAttribute"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TAnnotationType"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TAnnotationTypeAttribute"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TAssociation"},{"p":"org.moosetechnology.model.famixjava.moosequery","l":"TAssociationMetaLevelDependency"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TAttribute"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TCanBeAbstract"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TCanBeClassSide"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TCanBeFinal"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"TCanBeSynchronized"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"TCanBeTransient"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"TCanBeVolatile"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TCanImplement"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TClass"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TClassHierarchyNavigation"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"TClassMetrics"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TClassMetrics"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TClassWithVisibility"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TCohesionCouplingMetrics"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TComment"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TCompilationUnit"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TDefinedInModule"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TDereferencedInvocation"},{"p":"org.moosetechnology.model.famixjava.moosequery","l":"TEntityMetaLevelDependency"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TEnum"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TEnumValue"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TException"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TFile"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TFileAnchor"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TFileInclude"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TFileNavigation"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TFileSystemEntity"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TFolder"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TFunction"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TGlobalVariable"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"THasImmediateSource"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"THasKind"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"THasModifiers"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"THasSignature"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"THasVisibility"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"THeader"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TImplementable"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TImplementation"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TImplicitVariable"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TIndexedFileNavigation"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TInheritance"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TInvocable"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TInvocation"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TInvocationsReceiver"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TLCOMMetrics"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TLocalVariable"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TMethod"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TMethodMetrics"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TModule"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TMultipleFileAnchor"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TNamedEntity"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TNamespace"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TPackage"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TPackageable"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TParameter"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TParameterizedType"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TParameterizedTypeUser"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TParameterType"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TPreprocessorDefine"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TPreprocessorIfdef"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TPrimitiveType"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TReference"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TReferenceable"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TRelativeSourceAnchor"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TSourceAnchor"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TSourceEntity"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TSourceLanguage"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TStructuralEntity"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TTemplate"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TTemplateUser"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TTrait"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TTraitUsage"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TTraitUser"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TType"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TTypeAlias"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TTypedAnnotationInstance"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TTypedAnnotationInstanceAttribute"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TTypedEntity"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TUnknownSourceLanguage"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TUnknownVariable"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithAccesses"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithAnnotationInstanceAttributes"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithAnnotationInstances"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithAnnotationTypes"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithAttributes"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithClasses"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithComments"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithCompilationUnits"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithDereferencedInvocations"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithEnumValues"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithExceptions"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithFileIncludes"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithFiles"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithFunctions"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithGlobalVariables"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithHeaders"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithImplicitVariables"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithInheritances"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"TWithInterfaces"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithInvocations"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithLocalVariables"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithMethods"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithPackages"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithParameterizedTypes"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithParameterizedTypeUsers"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithParameters"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithReferences"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithSourceLanguages"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithStatements"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithTemplates"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithTraits"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithTypeAliases"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TWithTypes"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"Type"},{"p":"org.moosetechnology.model.famixjava.famixtraits","l":"TypeGroup"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"UnknownSourceLanguage"},{"p":"org.moosetechnology.model.famixjava.famixjavaentities","l":"UnknownVariable"},{"p":"fr.inria.verveine.extractor.java.utils","l":"Util"},{"p":"fr.inria.verveine.extractor.java","l":"VerveineJMain"},{"p":"fr.inria.verveine.extractor.java","l":"VerveineJOptions"},{"p":"fr.inria.verveine.extractor.java","l":"VerveineJParser"},{"p":"fr.inria.verveine.extractor.java.utils","l":"VerveineUtilsForTests"},{"p":"fr.inria.verveine.extractor.java.visitors.refvisitors","l":"VisitorAccessRef"},{"p":"fr.inria.verveine.extractor.java.visitors.refvisitors","l":"VisitorAnnotationRef"},{"p":"fr.inria.verveine.extractor.java.visitors.defvisitors","l":"VisitorClassMethodDef"},{"p":"fr.inria.verveine.extractor.java.visitors.defvisitors","l":"VisitorComments"},{"p":"fr.inria.verveine.extractor.java.visitors.refvisitors","l":"VisitorExceptionRef"},{"p":"fr.inria.verveine.extractor.java.visitors.refvisitors","l":"VisitorInheritanceRef"},{"p":"fr.inria.verveine.extractor.java.visitors.refvisitors","l":"VisitorInvocRef"},{"p":"fr.inria.verveine.extractor.java.visitors.defvisitors","l":"VisitorPackageDef"},{"p":"fr.inria.verveine.extractor.java.visitors.refvisitors","l":"VisitorTypeRefRef"},{"p":"fr.inria.verveine.extractor.java.visitors.defvisitors","l":"VisitorVarsDef"}];updateSearchResults();
\ No newline at end of file
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Access.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Access.java
similarity index 89%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Access.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Access.java
index 8ebd6697..f406bd6f 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Access.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Access.java
@@ -1,17 +1,18 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAccess;
-import org.moosetechnology.model.famixjava.famixtraits.TAccessible;
-import org.moosetechnology.model.famixjava.famixtraits.TAssociation;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAccesses;
-import org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAccess;
+import org.moosetechnology.model.famix.famixtraits.TAccessible;
+import org.moosetechnology.model.famix.famixtraits.TAssociation;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAccesses;
+import org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/AnnotationInstance.java b/gen/org/moosetechnology/model/famix/famixjavaentities/AnnotationInstance.java
similarity index 90%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/AnnotationInstance.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/AnnotationInstance.java
index 7c26b29b..1c9f9b52 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/AnnotationInstance.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/AnnotationInstance.java
@@ -1,18 +1,19 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixtraits.TAnnotationInstance;
-import org.moosetechnology.model.famixjava.famixtraits.TAnnotationInstanceAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TAnnotationType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedAnnotationInstance;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAnnotationInstanceAttributes;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAnnotationInstances;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixtraits.TAnnotationInstance;
+import org.moosetechnology.model.famix.famixtraits.TAnnotationInstanceAttribute;
+import org.moosetechnology.model.famix.famixtraits.TAnnotationType;
+import org.moosetechnology.model.famix.famixtraits.TTypedAnnotationInstance;
+import org.moosetechnology.model.famix.famixtraits.TWithAnnotationInstanceAttributes;
+import org.moosetechnology.model.famix.famixtraits.TWithAnnotationInstances;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/AnnotationInstanceAttribute.java b/gen/org/moosetechnology/model/famix/famixjavaentities/AnnotationInstanceAttribute.java
similarity index 90%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/AnnotationInstanceAttribute.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/AnnotationInstanceAttribute.java
index 261a7fe4..118d2e6a 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/AnnotationInstanceAttribute.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/AnnotationInstanceAttribute.java
@@ -1,14 +1,15 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.famixtraits.TAnnotationInstanceAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TAnnotationTypeAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedAnnotationInstanceAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAnnotationInstanceAttributes;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixtraits.TAnnotationInstanceAttribute;
+import org.moosetechnology.model.famix.famixtraits.TAnnotationTypeAttribute;
+import org.moosetechnology.model.famix.famixtraits.TTypedAnnotationInstanceAttribute;
+import org.moosetechnology.model.famix.famixtraits.TWithAnnotationInstanceAttributes;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/AnnotationType.java b/gen/org/moosetechnology/model/famix/famixjavaentities/AnnotationType.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/AnnotationType.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/AnnotationType.java
index 632be137..7e794347 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/AnnotationType.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/AnnotationType.java
@@ -1,25 +1,26 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixtraits.TAnnotationType;
-import org.moosetechnology.model.famixjava.famixtraits.TAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TComment;
-import org.moosetechnology.model.famixjava.famixtraits.THasVisibility;
-import org.moosetechnology.model.famixjava.famixtraits.TImplementable;
-import org.moosetechnology.model.famixjava.famixtraits.TImplementation;
-import org.moosetechnology.model.famixjava.famixtraits.TInheritance;
-import org.moosetechnology.model.famixjava.famixtraits.TPackage;
-import org.moosetechnology.model.famixjava.famixtraits.TPackageable;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedAnnotationInstance;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAnnotationTypes;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAttributes;
-import org.moosetechnology.model.famixjava.famixtraits.TWithComments;
-import org.moosetechnology.model.famixjava.famixtraits.TWithInheritances;
+
+import org.moosetechnology.model.famix.famixtraits.TAnnotationType;
+import org.moosetechnology.model.famix.famixtraits.TAttribute;
+import org.moosetechnology.model.famix.famixtraits.TComment;
+import org.moosetechnology.model.famix.famixtraits.THasVisibility;
+import org.moosetechnology.model.famix.famixtraits.TImplementable;
+import org.moosetechnology.model.famix.famixtraits.TImplementation;
+import org.moosetechnology.model.famix.famixtraits.TInheritance;
+import org.moosetechnology.model.famix.famixtraits.TPackage;
+import org.moosetechnology.model.famix.famixtraits.TPackageable;
+import org.moosetechnology.model.famix.famixtraits.TTypedAnnotationInstance;
+import org.moosetechnology.model.famix.famixtraits.TWithAnnotationTypes;
+import org.moosetechnology.model.famix.famixtraits.TWithAttributes;
+import org.moosetechnology.model.famix.famixtraits.TWithComments;
+import org.moosetechnology.model.famix.famixtraits.TWithInheritances;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/AnnotationTypeAttribute.java b/gen/org/moosetechnology/model/famix/famixjavaentities/AnnotationTypeAttribute.java
similarity index 92%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/AnnotationTypeAttribute.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/AnnotationTypeAttribute.java
index 28358e7f..aa794f00 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/AnnotationTypeAttribute.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/AnnotationTypeAttribute.java
@@ -1,28 +1,29 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAccess;
-import org.moosetechnology.model.famixjava.famixtraits.TAccessible;
-import org.moosetechnology.model.famixjava.famixtraits.TAnnotationTypeAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TComment;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TStructuralEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedAnnotationInstanceAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAccesses;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAttributes;
-import org.moosetechnology.model.famixjava.famixtraits.TWithComments;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAccess;
+import org.moosetechnology.model.famix.famixtraits.TAccessible;
+import org.moosetechnology.model.famix.famixtraits.TAnnotationTypeAttribute;
+import org.moosetechnology.model.famix.famixtraits.TAttribute;
+import org.moosetechnology.model.famix.famixtraits.TComment;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TStructuralEntity;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TTypedAnnotationInstanceAttribute;
+import org.moosetechnology.model.famix.famixtraits.TTypedEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAccesses;
+import org.moosetechnology.model.famix.famixtraits.TWithAttributes;
+import org.moosetechnology.model.famix.famixtraits.TWithComments;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Attribute.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Attribute.java
similarity index 91%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Attribute.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Attribute.java
index a4dd2751..cbe11f22 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Attribute.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Attribute.java
@@ -1,31 +1,32 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAccess;
-import org.moosetechnology.model.famixjava.famixtraits.TAccessible;
-import org.moosetechnology.model.famixjava.famixtraits.TAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TCanBeClassSide;
-import org.moosetechnology.model.famixjava.famixtraits.TCanBeFinal;
-import org.moosetechnology.model.famixjava.famixtraits.TComment;
-import org.moosetechnology.model.famixjava.famixtraits.THasVisibility;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocation;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocationsReceiver;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TStructuralEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAccesses;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAttributes;
-import org.moosetechnology.model.famixjava.famixtraits.TWithComments;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAccess;
+import org.moosetechnology.model.famix.famixtraits.TAccessible;
+import org.moosetechnology.model.famix.famixtraits.TAttribute;
+import org.moosetechnology.model.famix.famixtraits.TCanBeClassSide;
+import org.moosetechnology.model.famix.famixtraits.TCanBeFinal;
+import org.moosetechnology.model.famix.famixtraits.TComment;
+import org.moosetechnology.model.famix.famixtraits.THasVisibility;
+import org.moosetechnology.model.famix.famixtraits.TInvocation;
+import org.moosetechnology.model.famix.famixtraits.TInvocationsReceiver;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TStructuralEntity;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TTypedEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAccesses;
+import org.moosetechnology.model.famix.famixtraits.TWithAttributes;
+import org.moosetechnology.model.famix.famixtraits.TWithComments;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Class.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Class.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Class.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Class.java
index 1b118c9a..73684b7a 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Class.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Class.java
@@ -1,41 +1,42 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TCanBeAbstract;
-import org.moosetechnology.model.famixjava.famixtraits.TCanBeClassSide;
-import org.moosetechnology.model.famixjava.famixtraits.TCanBeFinal;
-import org.moosetechnology.model.famixjava.famixtraits.TCanImplement;
-import org.moosetechnology.model.famixjava.famixtraits.TClass;
-import org.moosetechnology.model.famixjava.famixtraits.TComment;
-import org.moosetechnology.model.famixjava.famixtraits.THasVisibility;
-import org.moosetechnology.model.famixjava.famixtraits.TImplementation;
-import org.moosetechnology.model.famixjava.famixtraits.TInheritance;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocation;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocationsReceiver;
-import org.moosetechnology.model.famixjava.famixtraits.TLCOMMetrics;
-import org.moosetechnology.model.famixjava.famixtraits.TMethod;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TPackage;
-import org.moosetechnology.model.famixjava.famixtraits.TPackageable;
-import org.moosetechnology.model.famixjava.famixtraits.TReference;
-import org.moosetechnology.model.famixjava.famixtraits.TReferenceable;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAttributes;
-import org.moosetechnology.model.famixjava.famixtraits.TWithComments;
-import org.moosetechnology.model.famixjava.famixtraits.TWithInheritances;
-import org.moosetechnology.model.famixjava.famixtraits.TWithMethods;
-import org.moosetechnology.model.famixjava.famixtraits.TWithTypes;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAttribute;
+import org.moosetechnology.model.famix.famixtraits.TCanBeAbstract;
+import org.moosetechnology.model.famix.famixtraits.TCanBeClassSide;
+import org.moosetechnology.model.famix.famixtraits.TCanBeFinal;
+import org.moosetechnology.model.famix.famixtraits.TCanImplement;
+import org.moosetechnology.model.famix.famixtraits.TClass;
+import org.moosetechnology.model.famix.famixtraits.TComment;
+import org.moosetechnology.model.famix.famixtraits.THasVisibility;
+import org.moosetechnology.model.famix.famixtraits.TImplementation;
+import org.moosetechnology.model.famix.famixtraits.TInheritance;
+import org.moosetechnology.model.famix.famixtraits.TInvocation;
+import org.moosetechnology.model.famix.famixtraits.TInvocationsReceiver;
+import org.moosetechnology.model.famix.famixtraits.TLCOMMetrics;
+import org.moosetechnology.model.famix.famixtraits.TMethod;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TPackage;
+import org.moosetechnology.model.famix.famixtraits.TPackageable;
+import org.moosetechnology.model.famix.famixtraits.TReference;
+import org.moosetechnology.model.famix.famixtraits.TReferenceable;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TTypedEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAttributes;
+import org.moosetechnology.model.famix.famixtraits.TWithComments;
+import org.moosetechnology.model.famix.famixtraits.TWithInheritances;
+import org.moosetechnology.model.famix.famixtraits.TWithMethods;
+import org.moosetechnology.model.famix.famixtraits.TWithTypes;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Comment.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Comment.java
similarity index 84%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Comment.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Comment.java
index 6240cda0..a9d7d19e 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Comment.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Comment.java
@@ -1,11 +1,12 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
+
+import org.moosetechnology.model.famix.famixtraits.TComment;
+import org.moosetechnology.model.famix.famixtraits.TWithComments;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.famixtraits.TComment;
-import org.moosetechnology.model.famixjava.famixtraits.TWithComments;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/ContainerEntity.java b/gen/org/moosetechnology/model/famix/famixjavaentities/ContainerEntity.java
similarity index 91%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/ContainerEntity.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/ContainerEntity.java
index c7204a5f..2c84379a 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/ContainerEntity.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/ContainerEntity.java
@@ -1,16 +1,17 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixtraits.TAnnotationType;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAnnotationTypes;
-import org.moosetechnology.model.famixjava.famixtraits.TWithClasses;
-import org.moosetechnology.model.famixjava.famixtraits.TWithTypes;
+
+import org.moosetechnology.model.famix.famixtraits.TAnnotationType;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TWithAnnotationTypes;
+import org.moosetechnology.model.famix.famixtraits.TWithClasses;
+import org.moosetechnology.model.famix.famixtraits.TWithTypes;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Entity.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Entity.java
similarity index 58%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Entity.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Entity.java
index df46ec5f..66f82dd7 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Entity.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Entity.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
@@ -7,7 +7,7 @@
@FamePackage("Famix-Java-Entities")
@FameDescription("Entity")
-public class Entity extends org.moosetechnology.model.famixjava.moose.Entity {
+public class Entity extends org.moosetechnology.model.famix.moose.Entity {
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Enum.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Enum.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Enum.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Enum.java
index fa6b00c5..0f274edb 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Enum.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Enum.java
@@ -1,33 +1,34 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TComment;
-import org.moosetechnology.model.famixjava.famixtraits.TEnum;
-import org.moosetechnology.model.famixjava.famixtraits.TEnumValue;
-import org.moosetechnology.model.famixjava.famixtraits.THasVisibility;
-import org.moosetechnology.model.famixjava.famixtraits.TInheritance;
-import org.moosetechnology.model.famixjava.famixtraits.TMethod;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TReference;
-import org.moosetechnology.model.famixjava.famixtraits.TReferenceable;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAttributes;
-import org.moosetechnology.model.famixjava.famixtraits.TWithComments;
-import org.moosetechnology.model.famixjava.famixtraits.TWithEnumValues;
-import org.moosetechnology.model.famixjava.famixtraits.TWithInheritances;
-import org.moosetechnology.model.famixjava.famixtraits.TWithMethods;
-import org.moosetechnology.model.famixjava.famixtraits.TWithTypes;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAttribute;
+import org.moosetechnology.model.famix.famixtraits.TComment;
+import org.moosetechnology.model.famix.famixtraits.TEnum;
+import org.moosetechnology.model.famix.famixtraits.TEnumValue;
+import org.moosetechnology.model.famix.famixtraits.THasVisibility;
+import org.moosetechnology.model.famix.famixtraits.TInheritance;
+import org.moosetechnology.model.famix.famixtraits.TMethod;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TReference;
+import org.moosetechnology.model.famix.famixtraits.TReferenceable;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TTypedEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAttributes;
+import org.moosetechnology.model.famix.famixtraits.TWithComments;
+import org.moosetechnology.model.famix.famixtraits.TWithEnumValues;
+import org.moosetechnology.model.famix.famixtraits.TWithInheritances;
+import org.moosetechnology.model.famix.famixtraits.TWithMethods;
+import org.moosetechnology.model.famix.famixtraits.TWithTypes;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/EnumValue.java b/gen/org/moosetechnology/model/famix/famixjavaentities/EnumValue.java
similarity index 91%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/EnumValue.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/EnumValue.java
index c60e91f7..ac39b66b 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/EnumValue.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/EnumValue.java
@@ -1,26 +1,27 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAccess;
-import org.moosetechnology.model.famixjava.famixtraits.TAccessible;
-import org.moosetechnology.model.famixjava.famixtraits.TComment;
-import org.moosetechnology.model.famixjava.famixtraits.TEnumValue;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TStructuralEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAccesses;
-import org.moosetechnology.model.famixjava.famixtraits.TWithComments;
-import org.moosetechnology.model.famixjava.famixtraits.TWithEnumValues;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAccess;
+import org.moosetechnology.model.famix.famixtraits.TAccessible;
+import org.moosetechnology.model.famix.famixtraits.TComment;
+import org.moosetechnology.model.famix.famixtraits.TEnumValue;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TStructuralEntity;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TTypedEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAccesses;
+import org.moosetechnology.model.famix.famixtraits.TWithComments;
+import org.moosetechnology.model.famix.famixtraits.TWithEnumValues;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Exception.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Exception.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Exception.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Exception.java
index 9b96e724..5f5b8e1c 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Exception.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Exception.java
@@ -1,40 +1,41 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAnnotationInstance;
-import org.moosetechnology.model.famixjava.famixtraits.TAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TCanImplement;
-import org.moosetechnology.model.famixjava.famixtraits.TClass;
-import org.moosetechnology.model.famixjava.famixtraits.TComment;
-import org.moosetechnology.model.famixjava.famixtraits.TException;
-import org.moosetechnology.model.famixjava.famixtraits.TImplementation;
-import org.moosetechnology.model.famixjava.famixtraits.TInheritance;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocation;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocationsReceiver;
-import org.moosetechnology.model.famixjava.famixtraits.TMethod;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TPackage;
-import org.moosetechnology.model.famixjava.famixtraits.TPackageable;
-import org.moosetechnology.model.famixjava.famixtraits.TReference;
-import org.moosetechnology.model.famixjava.famixtraits.TReferenceable;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAnnotationInstances;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAttributes;
-import org.moosetechnology.model.famixjava.famixtraits.TWithComments;
-import org.moosetechnology.model.famixjava.famixtraits.TWithExceptions;
-import org.moosetechnology.model.famixjava.famixtraits.TWithInheritances;
-import org.moosetechnology.model.famixjava.famixtraits.TWithMethods;
-import org.moosetechnology.model.famixjava.famixtraits.TWithTypes;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAnnotationInstance;
+import org.moosetechnology.model.famix.famixtraits.TAttribute;
+import org.moosetechnology.model.famix.famixtraits.TCanImplement;
+import org.moosetechnology.model.famix.famixtraits.TClass;
+import org.moosetechnology.model.famix.famixtraits.TComment;
+import org.moosetechnology.model.famix.famixtraits.TException;
+import org.moosetechnology.model.famix.famixtraits.TImplementation;
+import org.moosetechnology.model.famix.famixtraits.TInheritance;
+import org.moosetechnology.model.famix.famixtraits.TInvocation;
+import org.moosetechnology.model.famix.famixtraits.TInvocationsReceiver;
+import org.moosetechnology.model.famix.famixtraits.TMethod;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TPackage;
+import org.moosetechnology.model.famix.famixtraits.TPackageable;
+import org.moosetechnology.model.famix.famixtraits.TReference;
+import org.moosetechnology.model.famix.famixtraits.TReferenceable;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TTypedEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAnnotationInstances;
+import org.moosetechnology.model.famix.famixtraits.TWithAttributes;
+import org.moosetechnology.model.famix.famixtraits.TWithComments;
+import org.moosetechnology.model.famix.famixtraits.TWithExceptions;
+import org.moosetechnology.model.famix.famixtraits.TWithInheritances;
+import org.moosetechnology.model.famix.famixtraits.TWithMethods;
+import org.moosetechnology.model.famix.famixtraits.TWithTypes;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/gen/org/moosetechnology/model/famix/famixjavaentities/FamixJavaEntitiesModel.java b/gen/org/moosetechnology/model/famix/famixjavaentities/FamixJavaEntitiesModel.java
new file mode 100644
index 00000000..b03f4179
--- /dev/null
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/FamixJavaEntitiesModel.java
@@ -0,0 +1,64 @@
+// Automagically generated code, please do not change
+package org.moosetechnology.model.famix.famixjavaentities;
+
+import ch.akuhn.fame.MetaRepository;
+
+public class FamixJavaEntitiesModel {
+
+ public static MetaRepository metamodel() {
+ MetaRepository metamodel = new MetaRepository();
+ importInto(metamodel);
+ return metamodel;
+ }
+
+ public static void importInto(MetaRepository metamodel) {
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Access.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.AnnotationInstance.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.AnnotationInstanceAttribute.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.AnnotationType.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.AnnotationTypeAttribute.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Attribute.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Class.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Comment.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.ContainerEntity.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Entity.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Enum.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.EnumValue.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Exception.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.FamixJavaModel.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.File.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Folder.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Implementation.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.ImplicitVariable.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.IndexedFileAnchor.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Inheritance.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Interface.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Invocation.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.LocalVariable.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Method.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.NamedEntity.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Package.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Parameter.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.ParameterType.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.ParameterizableClass.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.ParameterizableInterface.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.ParameterizedType.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.PrimitiveType.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Reference.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.SourceAnchor.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.SourceLanguage.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.SourceTextAnchor.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.SourcedEntity.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.TCanBeSynchronized.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.TCanBeTransient.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.TCanBeVolatile.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.TClassMetrics.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.TWithInterfaces.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.Type.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.UnknownSourceLanguage.class);
+ metamodel.with(org.moosetechnology.model.famix.famixjavaentities.UnknownVariable.class);
+
+ }
+
+}
+
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/FamixJavaModel.java b/gen/org/moosetechnology/model/famix/famixjavaentities/FamixJavaModel.java
similarity index 68%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/FamixJavaModel.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/FamixJavaModel.java
index 7b8024bd..8d969a7c 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/FamixJavaModel.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/FamixJavaModel.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
+
+import org.moosetechnology.model.famix.moose.Model;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moose.Model;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/File.java b/gen/org/moosetechnology/model/famix/famixjavaentities/File.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/File.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/File.java
index 6d57c23f..617bf9e8 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/File.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/File.java
@@ -1,15 +1,16 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixtraits.TFile;
-import org.moosetechnology.model.famixjava.famixtraits.TFileSystemEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TFolder;
-import org.moosetechnology.model.famixjava.famixtraits.TWithFiles;
+
+import org.moosetechnology.model.famix.famixtraits.TFile;
+import org.moosetechnology.model.famix.famixtraits.TFileSystemEntity;
+import org.moosetechnology.model.famix.famixtraits.TFolder;
+import org.moosetechnology.model.famix.famixtraits.TWithFiles;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Folder.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Folder.java
similarity index 95%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Folder.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Folder.java
index 1060149a..40ad4a7c 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Folder.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Folder.java
@@ -1,13 +1,14 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixtraits.TFileSystemEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TFolder;
+
+import org.moosetechnology.model.famix.famixtraits.TFileSystemEntity;
+import org.moosetechnology.model.famix.famixtraits.TFolder;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Implementation.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Implementation.java
similarity index 89%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Implementation.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Implementation.java
index 67122f0b..8004b4a6 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Implementation.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Implementation.java
@@ -1,17 +1,18 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAssociation;
-import org.moosetechnology.model.famixjava.famixtraits.TCanImplement;
-import org.moosetechnology.model.famixjava.famixtraits.TImplementable;
-import org.moosetechnology.model.famixjava.famixtraits.TImplementation;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAssociation;
+import org.moosetechnology.model.famix.famixtraits.TCanImplement;
+import org.moosetechnology.model.famix.famixtraits.TImplementable;
+import org.moosetechnology.model.famix.famixtraits.TImplementation;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/ImplicitVariable.java b/gen/org/moosetechnology/model/famix/famixjavaentities/ImplicitVariable.java
similarity index 91%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/ImplicitVariable.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/ImplicitVariable.java
index aba66d4d..121ee8e0 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/ImplicitVariable.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/ImplicitVariable.java
@@ -1,26 +1,27 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAccess;
-import org.moosetechnology.model.famixjava.famixtraits.TAccessible;
-import org.moosetechnology.model.famixjava.famixtraits.TImplicitVariable;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocation;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocationsReceiver;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TStructuralEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAccesses;
-import org.moosetechnology.model.famixjava.famixtraits.TWithImplicitVariables;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAccess;
+import org.moosetechnology.model.famix.famixtraits.TAccessible;
+import org.moosetechnology.model.famix.famixtraits.TImplicitVariable;
+import org.moosetechnology.model.famix.famixtraits.TInvocation;
+import org.moosetechnology.model.famix.famixtraits.TInvocationsReceiver;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TStructuralEntity;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TTypedEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAccesses;
+import org.moosetechnology.model.famix.famixtraits.TWithImplicitVariables;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/IndexedFileAnchor.java b/gen/org/moosetechnology/model/famix/famixjavaentities/IndexedFileAnchor.java
similarity index 85%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/IndexedFileAnchor.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/IndexedFileAnchor.java
index f461aa93..74c15918 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/IndexedFileAnchor.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/IndexedFileAnchor.java
@@ -1,12 +1,13 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
+
+import org.moosetechnology.model.famix.famixtraits.TFile;
+import org.moosetechnology.model.famix.famixtraits.TFileAnchor;
+import org.moosetechnology.model.famix.famixtraits.TIndexedFileNavigation;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.famixtraits.TFile;
-import org.moosetechnology.model.famixjava.famixtraits.TFileAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TIndexedFileNavigation;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Inheritance.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Inheritance.java
similarity index 89%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Inheritance.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Inheritance.java
index 80693198..aa76ed94 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Inheritance.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Inheritance.java
@@ -1,16 +1,17 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAssociation;
-import org.moosetechnology.model.famixjava.famixtraits.TInheritance;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithInheritances;
-import org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAssociation;
+import org.moosetechnology.model.famix.famixtraits.TInheritance;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithInheritances;
+import org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Interface.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Interface.java
similarity index 92%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Interface.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Interface.java
index 2c8614fe..073eba4c 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Interface.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Interface.java
@@ -1,30 +1,29 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixtraits.TAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TCanBeClassSide;
-import org.moosetechnology.model.famixjava.famixtraits.TCanBeFinal;
-import org.moosetechnology.model.famixjava.famixtraits.TComment;
-import org.moosetechnology.model.famixjava.famixtraits.THasVisibility;
-import org.moosetechnology.model.famixjava.famixtraits.TImplementable;
-import org.moosetechnology.model.famixjava.famixtraits.TImplementation;
-import org.moosetechnology.model.famixjava.famixtraits.TInheritance;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocation;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocationsReceiver;
-import org.moosetechnology.model.famixjava.famixtraits.TMethod;
-import org.moosetechnology.model.famixjava.famixtraits.TPackage;
-import org.moosetechnology.model.famixjava.famixtraits.TPackageable;
-import org.moosetechnology.model.famixjava.famixtraits.TParameterizedType;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAttributes;
-import org.moosetechnology.model.famixjava.famixtraits.TWithComments;
-import org.moosetechnology.model.famixjava.famixtraits.TWithInheritances;
-import org.moosetechnology.model.famixjava.famixtraits.TWithMethods;
-import org.moosetechnology.model.famixjava.famixtraits.TWithParameterizedTypes;
+
+import org.moosetechnology.model.famix.famixtraits.TAttribute;
+import org.moosetechnology.model.famix.famixtraits.TCanBeClassSide;
+import org.moosetechnology.model.famix.famixtraits.TCanBeFinal;
+import org.moosetechnology.model.famix.famixtraits.TComment;
+import org.moosetechnology.model.famix.famixtraits.THasVisibility;
+import org.moosetechnology.model.famix.famixtraits.TImplementable;
+import org.moosetechnology.model.famix.famixtraits.TImplementation;
+import org.moosetechnology.model.famix.famixtraits.TInheritance;
+import org.moosetechnology.model.famix.famixtraits.TInvocation;
+import org.moosetechnology.model.famix.famixtraits.TInvocationsReceiver;
+import org.moosetechnology.model.famix.famixtraits.TMethod;
+import org.moosetechnology.model.famix.famixtraits.TPackage;
+import org.moosetechnology.model.famix.famixtraits.TPackageable;
+import org.moosetechnology.model.famix.famixtraits.TWithAttributes;
+import org.moosetechnology.model.famix.famixtraits.TWithComments;
+import org.moosetechnology.model.famix.famixtraits.TWithInheritances;
+import org.moosetechnology.model.famix.famixtraits.TWithMethods;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Invocation.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Invocation.java
similarity index 89%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Invocation.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Invocation.java
index 914f8877..60d95d55 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Invocation.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Invocation.java
@@ -1,22 +1,22 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAssociation;
-import org.moosetechnology.model.famixjava.famixtraits.THasSignature;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocable;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocation;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocationsReceiver;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithInvocations;
-import org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAssociation;
+import org.moosetechnology.model.famix.famixtraits.THasSignature;
+import org.moosetechnology.model.famix.famixtraits.TInvocable;
+import org.moosetechnology.model.famix.famixtraits.TInvocation;
+import org.moosetechnology.model.famix.famixtraits.TInvocationsReceiver;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithInvocations;
+import org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/LocalVariable.java b/gen/org/moosetechnology/model/famix/famixjavaentities/LocalVariable.java
similarity index 91%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/LocalVariable.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/LocalVariable.java
index f684dc38..14d3b37d 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/LocalVariable.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/LocalVariable.java
@@ -1,29 +1,30 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAccess;
-import org.moosetechnology.model.famixjava.famixtraits.TAccessible;
-import org.moosetechnology.model.famixjava.famixtraits.TCanBeFinal;
-import org.moosetechnology.model.famixjava.famixtraits.TComment;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocation;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocationsReceiver;
-import org.moosetechnology.model.famixjava.famixtraits.TLocalVariable;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TStructuralEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAccesses;
-import org.moosetechnology.model.famixjava.famixtraits.TWithComments;
-import org.moosetechnology.model.famixjava.famixtraits.TWithLocalVariables;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAccess;
+import org.moosetechnology.model.famix.famixtraits.TAccessible;
+import org.moosetechnology.model.famix.famixtraits.TCanBeFinal;
+import org.moosetechnology.model.famix.famixtraits.TComment;
+import org.moosetechnology.model.famix.famixtraits.TInvocation;
+import org.moosetechnology.model.famix.famixtraits.TInvocationsReceiver;
+import org.moosetechnology.model.famix.famixtraits.TLocalVariable;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TStructuralEntity;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TTypedEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAccesses;
+import org.moosetechnology.model.famix.famixtraits.TWithComments;
+import org.moosetechnology.model.famix.famixtraits.TWithLocalVariables;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Method.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Method.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Method.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Method.java
index 92aa9c19..ce23f91a 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Method.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Method.java
@@ -1,45 +1,46 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAccess;
-import org.moosetechnology.model.famixjava.famixtraits.TCanBeAbstract;
-import org.moosetechnology.model.famixjava.famixtraits.TCanBeClassSide;
-import org.moosetechnology.model.famixjava.famixtraits.TCanBeFinal;
-import org.moosetechnology.model.famixjava.famixtraits.TComment;
-import org.moosetechnology.model.famixjava.famixtraits.TException;
-import org.moosetechnology.model.famixjava.famixtraits.THasKind;
-import org.moosetechnology.model.famixjava.famixtraits.THasSignature;
-import org.moosetechnology.model.famixjava.famixtraits.THasVisibility;
-import org.moosetechnology.model.famixjava.famixtraits.TImplicitVariable;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocable;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocation;
-import org.moosetechnology.model.famixjava.famixtraits.TLocalVariable;
-import org.moosetechnology.model.famixjava.famixtraits.TMethod;
-import org.moosetechnology.model.famixjava.famixtraits.TMethodMetrics;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TParameter;
-import org.moosetechnology.model.famixjava.famixtraits.TReference;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAccesses;
-import org.moosetechnology.model.famixjava.famixtraits.TWithComments;
-import org.moosetechnology.model.famixjava.famixtraits.TWithExceptions;
-import org.moosetechnology.model.famixjava.famixtraits.TWithImplicitVariables;
-import org.moosetechnology.model.famixjava.famixtraits.TWithInvocations;
-import org.moosetechnology.model.famixjava.famixtraits.TWithLocalVariables;
-import org.moosetechnology.model.famixjava.famixtraits.TWithMethods;
-import org.moosetechnology.model.famixjava.famixtraits.TWithParameters;
-import org.moosetechnology.model.famixjava.famixtraits.TWithReferences;
-import org.moosetechnology.model.famixjava.famixtraits.TWithStatements;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAccess;
+import org.moosetechnology.model.famix.famixtraits.TCanBeAbstract;
+import org.moosetechnology.model.famix.famixtraits.TCanBeClassSide;
+import org.moosetechnology.model.famix.famixtraits.TCanBeFinal;
+import org.moosetechnology.model.famix.famixtraits.TComment;
+import org.moosetechnology.model.famix.famixtraits.TException;
+import org.moosetechnology.model.famix.famixtraits.THasKind;
+import org.moosetechnology.model.famix.famixtraits.THasSignature;
+import org.moosetechnology.model.famix.famixtraits.THasVisibility;
+import org.moosetechnology.model.famix.famixtraits.TImplicitVariable;
+import org.moosetechnology.model.famix.famixtraits.TInvocable;
+import org.moosetechnology.model.famix.famixtraits.TInvocation;
+import org.moosetechnology.model.famix.famixtraits.TLocalVariable;
+import org.moosetechnology.model.famix.famixtraits.TMethod;
+import org.moosetechnology.model.famix.famixtraits.TMethodMetrics;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TParameter;
+import org.moosetechnology.model.famix.famixtraits.TReference;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TTypedEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAccesses;
+import org.moosetechnology.model.famix.famixtraits.TWithComments;
+import org.moosetechnology.model.famix.famixtraits.TWithExceptions;
+import org.moosetechnology.model.famix.famixtraits.TWithImplicitVariables;
+import org.moosetechnology.model.famix.famixtraits.TWithInvocations;
+import org.moosetechnology.model.famix.famixtraits.TWithLocalVariables;
+import org.moosetechnology.model.famix.famixtraits.TWithMethods;
+import org.moosetechnology.model.famix.famixtraits.TWithParameters;
+import org.moosetechnology.model.famix.famixtraits.TWithReferences;
+import org.moosetechnology.model.famix.famixtraits.TWithStatements;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/NamedEntity.java b/gen/org/moosetechnology/model/famix/famixjavaentities/NamedEntity.java
similarity index 92%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/NamedEntity.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/NamedEntity.java
index 77b5906b..5b2b1cdb 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/NamedEntity.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/NamedEntity.java
@@ -1,17 +1,18 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixtraits.TAnnotationInstance;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocation;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocationsReceiver;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAnnotationInstances;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixtraits.TAnnotationInstance;
+import org.moosetechnology.model.famix.famixtraits.TInvocation;
+import org.moosetechnology.model.famix.famixtraits.TInvocationsReceiver;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAnnotationInstances;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
@@ -24,7 +25,10 @@ public class NamedEntity extends SourcedEntity implements TEntityMetaLevelDepend
private Collection receivingInvocations;
-
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + "(" + getName() + ")";
+ }
@FameProperty(name = "annotationInstances", opposite = "annotatedEntity", derived = true)
public Collection getAnnotationInstances() {
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Package.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Package.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Package.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Package.java
index 8a8328db..47f372e3 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Package.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Package.java
@@ -1,22 +1,23 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TComment;
-import org.moosetechnology.model.famixjava.famixtraits.TGlobalVariable;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TPackage;
-import org.moosetechnology.model.famixjava.famixtraits.TPackageable;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithComments;
-import org.moosetechnology.model.famixjava.famixtraits.TWithGlobalVariables;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TComment;
+import org.moosetechnology.model.famix.famixtraits.TGlobalVariable;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TPackage;
+import org.moosetechnology.model.famix.famixtraits.TPackageable;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithComments;
+import org.moosetechnology.model.famix.famixtraits.TWithGlobalVariables;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Parameter.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Parameter.java
similarity index 91%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Parameter.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Parameter.java
index b3e9b52f..bdb67eaf 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Parameter.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Parameter.java
@@ -1,27 +1,28 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAccess;
-import org.moosetechnology.model.famixjava.famixtraits.TAccessible;
-import org.moosetechnology.model.famixjava.famixtraits.TCanBeFinal;
-import org.moosetechnology.model.famixjava.famixtraits.TComment;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TParameter;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TStructuralEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAccesses;
-import org.moosetechnology.model.famixjava.famixtraits.TWithComments;
-import org.moosetechnology.model.famixjava.famixtraits.TWithParameters;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAccess;
+import org.moosetechnology.model.famix.famixtraits.TAccessible;
+import org.moosetechnology.model.famix.famixtraits.TCanBeFinal;
+import org.moosetechnology.model.famix.famixtraits.TComment;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TParameter;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TStructuralEntity;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TTypedEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAccesses;
+import org.moosetechnology.model.famix.famixtraits.TWithComments;
+import org.moosetechnology.model.famix.famixtraits.TWithParameters;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/ParameterType.java b/gen/org/moosetechnology/model/famix/famixjavaentities/ParameterType.java
similarity index 67%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/ParameterType.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/ParameterType.java
index e7a39074..5058d890 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/ParameterType.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/ParameterType.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
+
+import org.moosetechnology.model.famix.famixtraits.TParameterType;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.famixtraits.TParameterType;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/ParameterizableClass.java b/gen/org/moosetechnology/model/famix/famixjavaentities/ParameterizableClass.java
similarity index 92%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/ParameterizableClass.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/ParameterizableClass.java
index 6090054d..e99066bf 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/ParameterizableClass.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/ParameterizableClass.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
@@ -8,8 +8,8 @@
import java.util.*;
import java.util.stream.Collectors;
-import org.moosetechnology.model.famixjava.famixtraits.TParameterizedType;
-import org.moosetechnology.model.famixjava.famixtraits.TWithParameterizedTypes;
+import org.moosetechnology.model.famix.famixtraits.TParameterizedType;
+import org.moosetechnology.model.famix.famixtraits.TWithParameterizedTypes;
@FamePackage("Famix-Java-Entities")
@FameDescription("ParameterizableClass")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/ParameterizableInterface.java b/gen/org/moosetechnology/model/famix/famixjavaentities/ParameterizableInterface.java
similarity index 91%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/ParameterizableInterface.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/ParameterizableInterface.java
index 81de2aa1..8cb10286 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/ParameterizableInterface.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/ParameterizableInterface.java
@@ -1,13 +1,14 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixtraits.TParameterizedType;
-import org.moosetechnology.model.famixjava.famixtraits.TWithParameterizedTypes;
+
+import org.moosetechnology.model.famix.famixtraits.TParameterizedType;
+import org.moosetechnology.model.famix.famixtraits.TWithParameterizedTypes;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/ParameterizedType.java b/gen/org/moosetechnology/model/famix/famixjavaentities/ParameterizedType.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/ParameterizedType.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/ParameterizedType.java
index 0fd21872..4606dfa6 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/ParameterizedType.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/ParameterizedType.java
@@ -1,20 +1,21 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixtraits.TCanImplement;
-import org.moosetechnology.model.famixjava.famixtraits.TImplementable;
-import org.moosetechnology.model.famixjava.famixtraits.TImplementation;
-import org.moosetechnology.model.famixjava.famixtraits.TInheritance;
-import org.moosetechnology.model.famixjava.famixtraits.TParameterizedType;
-import org.moosetechnology.model.famixjava.famixtraits.TParameterizedTypeUser;
-import org.moosetechnology.model.famixjava.famixtraits.TWithInheritances;
-import org.moosetechnology.model.famixjava.famixtraits.TWithParameterizedTypeUsers;
-import org.moosetechnology.model.famixjava.famixtraits.TWithParameterizedTypes;
+
+import org.moosetechnology.model.famix.famixtraits.TCanImplement;
+import org.moosetechnology.model.famix.famixtraits.TImplementable;
+import org.moosetechnology.model.famix.famixtraits.TImplementation;
+import org.moosetechnology.model.famix.famixtraits.TInheritance;
+import org.moosetechnology.model.famix.famixtraits.TParameterizedType;
+import org.moosetechnology.model.famix.famixtraits.TParameterizedTypeUser;
+import org.moosetechnology.model.famix.famixtraits.TWithInheritances;
+import org.moosetechnology.model.famix.famixtraits.TWithParameterizedTypeUsers;
+import org.moosetechnology.model.famix.famixtraits.TWithParameterizedTypes;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/PrimitiveType.java b/gen/org/moosetechnology/model/famix/famixjavaentities/PrimitiveType.java
similarity index 92%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/PrimitiveType.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/PrimitiveType.java
index 09b2c6db..4815be5e 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/PrimitiveType.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/PrimitiveType.java
@@ -1,22 +1,23 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TPrimitiveType;
-import org.moosetechnology.model.famixjava.famixtraits.TReference;
-import org.moosetechnology.model.famixjava.famixtraits.TReferenceable;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithTypes;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TPrimitiveType;
+import org.moosetechnology.model.famix.famixtraits.TReference;
+import org.moosetechnology.model.famix.famixtraits.TReferenceable;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TTypedEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithTypes;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Reference.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Reference.java
similarity index 88%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Reference.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Reference.java
index a93dcefd..a84be051 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Reference.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Reference.java
@@ -1,17 +1,18 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAssociation;
-import org.moosetechnology.model.famixjava.famixtraits.TReference;
-import org.moosetechnology.model.famixjava.famixtraits.TReferenceable;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithReferences;
-import org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAssociation;
+import org.moosetechnology.model.famix.famixtraits.TReference;
+import org.moosetechnology.model.famix.famixtraits.TReferenceable;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithReferences;
+import org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/SourceAnchor.java b/gen/org/moosetechnology/model/famix/famixjavaentities/SourceAnchor.java
similarity index 84%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/SourceAnchor.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/SourceAnchor.java
index 3d081d60..c257cd01 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/SourceAnchor.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/SourceAnchor.java
@@ -1,11 +1,12 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
+
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/SourceLanguage.java b/gen/org/moosetechnology/model/famix/famixjavaentities/SourceLanguage.java
similarity index 92%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/SourceLanguage.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/SourceLanguage.java
index 7a9604f2..ddb5292c 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/SourceLanguage.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/SourceLanguage.java
@@ -1,13 +1,14 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceLanguage;
-import org.moosetechnology.model.famixjava.famixtraits.TWithSourceLanguages;
+
+import org.moosetechnology.model.famix.famixtraits.TSourceLanguage;
+import org.moosetechnology.model.famix.famixtraits.TWithSourceLanguages;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/SourceTextAnchor.java b/gen/org/moosetechnology/model/famix/famixjavaentities/SourceTextAnchor.java
similarity index 83%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/SourceTextAnchor.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/SourceTextAnchor.java
index 35841bab..a00c7e9d 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/SourceTextAnchor.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/SourceTextAnchor.java
@@ -1,12 +1,13 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
+
+import org.moosetechnology.model.famix.famixtraits.THasImmediateSource;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.famixtraits.THasImmediateSource;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/SourcedEntity.java b/gen/org/moosetechnology/model/famix/famixjavaentities/SourcedEntity.java
similarity index 92%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/SourcedEntity.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/SourcedEntity.java
index 573d51d7..a07d332b 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/SourcedEntity.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/SourcedEntity.java
@@ -1,16 +1,17 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TFile;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithFiles;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TFile;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithFiles;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/TCanBeSynchronized.java b/gen/org/moosetechnology/model/famix/famixjavaentities/TCanBeSynchronized.java
similarity index 87%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/TCanBeSynchronized.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/TCanBeSynchronized.java
index 9ce7d3ad..35765be6 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/TCanBeSynchronized.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/TCanBeSynchronized.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/TCanBeTransient.java b/gen/org/moosetechnology/model/famix/famixjavaentities/TCanBeTransient.java
similarity index 86%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/TCanBeTransient.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/TCanBeTransient.java
index 70fd2ab4..951635ee 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/TCanBeTransient.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/TCanBeTransient.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/TCanBeVolatile.java b/gen/org/moosetechnology/model/famix/famixjavaentities/TCanBeVolatile.java
similarity index 86%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/TCanBeVolatile.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/TCanBeVolatile.java
index b915c83b..0f22d7ae 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/TCanBeVolatile.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/TCanBeVolatile.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/TClassMetrics.java b/gen/org/moosetechnology/model/famix/famixjavaentities/TClassMetrics.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/TClassMetrics.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/TClassMetrics.java
index 11a9ae83..14b13990 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/TClassMetrics.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/TClassMetrics.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/TWithInterfaces.java b/gen/org/moosetechnology/model/famix/famixjavaentities/TWithInterfaces.java
similarity index 67%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/TWithInterfaces.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/TWithInterfaces.java
index 5dd7ae00..114dfa8a 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/TWithInterfaces.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/TWithInterfaces.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
+
+import org.moosetechnology.model.famix.famixtraits.TWithTypes;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.famixtraits.TWithTypes;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/Type.java b/gen/org/moosetechnology/model/famix/famixjavaentities/Type.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/Type.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/Type.java
index 5bd8a643..672569b3 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/Type.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/Type.java
@@ -1,27 +1,28 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TMethod;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TParameterizedTypeUser;
-import org.moosetechnology.model.famixjava.famixtraits.TReference;
-import org.moosetechnology.model.famixjava.famixtraits.TReferenceable;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypeAlias;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithMethods;
-import org.moosetechnology.model.famixjava.famixtraits.TWithParameterizedTypeUsers;
-import org.moosetechnology.model.famixjava.famixtraits.TWithTypeAliases;
-import org.moosetechnology.model.famixjava.famixtraits.TWithTypes;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TMethod;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TParameterizedTypeUser;
+import org.moosetechnology.model.famix.famixtraits.TReference;
+import org.moosetechnology.model.famix.famixtraits.TReferenceable;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TTypeAlias;
+import org.moosetechnology.model.famix.famixtraits.TTypedEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithMethods;
+import org.moosetechnology.model.famix.famixtraits.TWithParameterizedTypeUsers;
+import org.moosetechnology.model.famix.famixtraits.TWithTypeAliases;
+import org.moosetechnology.model.famix.famixtraits.TWithTypes;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/UnknownSourceLanguage.java b/gen/org/moosetechnology/model/famix/famixjavaentities/UnknownSourceLanguage.java
similarity index 89%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/UnknownSourceLanguage.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/UnknownSourceLanguage.java
index a2f3a33a..2cb86542 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/UnknownSourceLanguage.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/UnknownSourceLanguage.java
@@ -1,14 +1,15 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceLanguage;
-import org.moosetechnology.model.famixjava.famixtraits.TUnknownSourceLanguage;
-import org.moosetechnology.model.famixjava.famixtraits.TWithSourceLanguages;
+
+import org.moosetechnology.model.famix.famixtraits.TSourceLanguage;
+import org.moosetechnology.model.famix.famixtraits.TUnknownSourceLanguage;
+import org.moosetechnology.model.famix.famixtraits.TWithSourceLanguages;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/UnknownVariable.java b/gen/org/moosetechnology/model/famix/famixjavaentities/UnknownVariable.java
similarity index 91%
rename from src/org/moosetechnology/model/famixjava/famixjavaentities/UnknownVariable.java
rename to gen/org/moosetechnology/model/famix/famixjavaentities/UnknownVariable.java
index cb9fa1c0..628cbeb7 100644
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/UnknownVariable.java
+++ b/gen/org/moosetechnology/model/famix/famixjavaentities/UnknownVariable.java
@@ -1,25 +1,26 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
+package org.moosetechnology.model.famix.famixjavaentities;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
-import org.moosetechnology.model.famixjava.famixtraits.TAccess;
-import org.moosetechnology.model.famixjava.famixtraits.TAccessible;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocation;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocationsReceiver;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TStructuralEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TUnknownVariable;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAccesses;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
+import org.moosetechnology.model.famix.famixtraits.TAccess;
+import org.moosetechnology.model.famix.famixtraits.TAccessible;
+import org.moosetechnology.model.famix.famixtraits.TInvocation;
+import org.moosetechnology.model.famix.famixtraits.TInvocationsReceiver;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TStructuralEntity;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TTypedEntity;
+import org.moosetechnology.model.famix.famixtraits.TUnknownVariable;
+import org.moosetechnology.model.famix.famixtraits.TWithAccesses;
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Java-Entities")
diff --git a/src/org/moosetechnology/model/famixjava/famixreplication/FamixReplicationModel.java b/gen/org/moosetechnology/model/famix/famixreplication/FamixReplicationModel.java
similarity index 60%
rename from src/org/moosetechnology/model/famixjava/famixreplication/FamixReplicationModel.java
rename to gen/org/moosetechnology/model/famix/famixreplication/FamixReplicationModel.java
index 9bf0d85e..a9d37c30 100644
--- a/src/org/moosetechnology/model/famixjava/famixreplication/FamixReplicationModel.java
+++ b/gen/org/moosetechnology/model/famix/famixreplication/FamixReplicationModel.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixreplication;
+package org.moosetechnology.model.famix.famixreplication;
import ch.akuhn.fame.MetaRepository;
@@ -12,8 +12,8 @@ public static MetaRepository metamodel() {
}
public static void importInto(MetaRepository metamodel) {
- metamodel.with(org.moosetechnology.model.famixjava.famixreplication.Replica.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixreplication.ReplicatedFragment.class);
+ metamodel.with(org.moosetechnology.model.famix.famixreplication.Replica.class);
+ metamodel.with(org.moosetechnology.model.famix.famixreplication.ReplicatedFragment.class);
}
diff --git a/src/org/moosetechnology/model/famixjava/famixreplication/Replica.java b/gen/org/moosetechnology/model/famix/famixreplication/Replica.java
similarity index 66%
rename from src/org/moosetechnology/model/famixjava/famixreplication/Replica.java
rename to gen/org/moosetechnology/model/famix/famixreplication/Replica.java
index b8dc4fa4..120411d1 100644
--- a/src/org/moosetechnology/model/famixjava/famixreplication/Replica.java
+++ b/gen/org/moosetechnology/model/famix/famixreplication/Replica.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixreplication;
+package org.moosetechnology.model.famix.famixreplication;
+
+import org.moosetechnology.model.famix.moose.Entity;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moose.Entity;
@FamePackage("FamixReplication")
diff --git a/src/org/moosetechnology/model/famixjava/famixreplication/ReplicatedFragment.java b/gen/org/moosetechnology/model/famix/famixreplication/ReplicatedFragment.java
similarity index 68%
rename from src/org/moosetechnology/model/famixjava/famixreplication/ReplicatedFragment.java
rename to gen/org/moosetechnology/model/famix/famixreplication/ReplicatedFragment.java
index 0146bbba..65e25cd8 100644
--- a/src/org/moosetechnology/model/famixjava/famixreplication/ReplicatedFragment.java
+++ b/gen/org/moosetechnology/model/famix/famixreplication/ReplicatedFragment.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixreplication;
+package org.moosetechnology.model.famix.famixreplication;
+
+import org.moosetechnology.model.famix.moose.Entity;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moose.Entity;
@FamePackage("FamixReplication")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/AnnotationInstanceGroup.java b/gen/org/moosetechnology/model/famix/famixtraits/AnnotationInstanceGroup.java
similarity index 68%
rename from src/org/moosetechnology/model/famixjava/famixtraits/AnnotationInstanceGroup.java
rename to gen/org/moosetechnology/model/famix/famixtraits/AnnotationInstanceGroup.java
index 218c621d..0b72e665 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/AnnotationInstanceGroup.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/AnnotationInstanceGroup.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moose.SpecializedGroup;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moose.SpecializedGroup;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/AnnotationTypeGroup.java b/gen/org/moosetechnology/model/famix/famixtraits/AnnotationTypeGroup.java
similarity index 68%
rename from src/org/moosetechnology/model/famixjava/famixtraits/AnnotationTypeGroup.java
rename to gen/org/moosetechnology/model/famix/famixtraits/AnnotationTypeGroup.java
index da0beeae..09599de7 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/AnnotationTypeGroup.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/AnnotationTypeGroup.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moose.SpecializedGroup;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moose.SpecializedGroup;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/ClassGroup.java b/gen/org/moosetechnology/model/famix/famixtraits/ClassGroup.java
similarity index 80%
rename from src/org/moosetechnology/model/famixjava/famixtraits/ClassGroup.java
rename to gen/org/moosetechnology/model/famix/famixtraits/ClassGroup.java
index c234465e..bbba8055 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/ClassGroup.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/ClassGroup.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/FamixModel.java b/gen/org/moosetechnology/model/famix/famixtraits/FamixModel.java
similarity index 67%
rename from src/org/moosetechnology/model/famixjava/famixtraits/FamixModel.java
rename to gen/org/moosetechnology/model/famix/famixtraits/FamixModel.java
index 3d4405bc..89b0af4f 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/FamixModel.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/FamixModel.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moose.Model;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moose.Model;
@FamePackage("Famix-Traits")
diff --git a/gen/org/moosetechnology/model/famix/famixtraits/FamixTraitsModel.java b/gen/org/moosetechnology/model/famix/famixtraits/FamixTraitsModel.java
new file mode 100644
index 00000000..d847e7e5
--- /dev/null
+++ b/gen/org/moosetechnology/model/famix/famixtraits/FamixTraitsModel.java
@@ -0,0 +1,145 @@
+// Automagically generated code, please do not change
+package org.moosetechnology.model.famix.famixtraits;
+
+import ch.akuhn.fame.MetaRepository;
+
+public class FamixTraitsModel {
+
+ public static MetaRepository metamodel() {
+ MetaRepository metamodel = new MetaRepository();
+ importInto(metamodel);
+ return metamodel;
+ }
+
+ public static void importInto(MetaRepository metamodel) {
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.AnnotationInstanceGroup.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.AnnotationTypeGroup.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.ClassGroup.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.FamixModel.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.FileGroup.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.FolderGroup.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.GlobalVariableGroup.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.InvocationGroup.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.MethodGroup.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.NamespaceGroup.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.PackageGroup.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TAccess.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TAccessible.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TAnnotationInstance.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TAnnotationInstanceAttribute.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TAnnotationType.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TAnnotationTypeAttribute.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TAssociation.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TAttribute.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TCanBeAbstract.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TCanBeClassSide.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TCanBeFinal.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TCanImplement.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TClass.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TClassHierarchyNavigation.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TClassMetrics.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TClassWithVisibility.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TCohesionCouplingMetrics.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TComment.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TCompilationUnit.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TDefinedInModule.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TDereferencedInvocation.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TEnum.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TEnumValue.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TException.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TFile.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TFileAnchor.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TFileInclude.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TFileNavigation.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TFileSystemEntity.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TFolder.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TFunction.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TGlobalVariable.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.THasImmediateSource.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.THasKind.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.THasModifiers.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.THasSignature.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.THasVisibility.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.THeader.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TImplementable.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TImplementation.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TImplicitVariable.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TIndexedFileNavigation.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TInheritance.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TInvocable.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TInvocation.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TInvocationsReceiver.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TLCOMMetrics.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TLocalVariable.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TMethod.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TMethodMetrics.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TModule.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TMultipleFileAnchor.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TNamedEntity.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TNamespace.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TPackage.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TPackageable.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TParameter.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TParameterType.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TParameterizedType.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TParameterizedTypeUser.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TPreprocessorDefine.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TPreprocessorIfdef.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TPrimitiveType.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TReference.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TReferenceable.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TRelativeSourceAnchor.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TSourceAnchor.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TSourceEntity.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TSourceLanguage.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TStructuralEntity.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TTemplate.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TTemplateUser.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TTrait.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TTraitUsage.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TTraitUser.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TType.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TTypeAlias.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TTypedAnnotationInstance.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TTypedAnnotationInstanceAttribute.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TTypedEntity.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TUnknownSourceLanguage.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TUnknownVariable.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithAccesses.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithAnnotationInstanceAttributes.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithAnnotationInstances.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithAnnotationTypes.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithAttributes.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithClasses.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithComments.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithCompilationUnits.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithDereferencedInvocations.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithEnumValues.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithExceptions.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithFileIncludes.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithFiles.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithFunctions.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithGlobalVariables.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithHeaders.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithImplicitVariables.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithInheritances.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithInvocations.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithLocalVariables.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithMethods.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithPackages.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithParameterizedTypeUsers.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithParameterizedTypes.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithParameters.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithReferences.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithSourceLanguages.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithStatements.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithTemplates.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithTraits.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithTypeAliases.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TWithTypes.class);
+ metamodel.with(org.moosetechnology.model.famix.famixtraits.TypeGroup.class);
+
+ }
+
+}
+
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/FileGroup.java b/gen/org/moosetechnology/model/famix/famixtraits/FileGroup.java
similarity index 66%
rename from src/org/moosetechnology/model/famixjava/famixtraits/FileGroup.java
rename to gen/org/moosetechnology/model/famix/famixtraits/FileGroup.java
index cb7b02d8..b189ead5 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/FileGroup.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/FileGroup.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moose.SpecializedGroup;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moose.SpecializedGroup;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/FolderGroup.java b/gen/org/moosetechnology/model/famix/famixtraits/FolderGroup.java
similarity index 66%
rename from src/org/moosetechnology/model/famixjava/famixtraits/FolderGroup.java
rename to gen/org/moosetechnology/model/famix/famixtraits/FolderGroup.java
index a1f411e4..8109cd93 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/FolderGroup.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/FolderGroup.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moose.SpecializedGroup;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moose.SpecializedGroup;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/GlobalVariableGroup.java b/gen/org/moosetechnology/model/famix/famixtraits/GlobalVariableGroup.java
similarity index 68%
rename from src/org/moosetechnology/model/famixjava/famixtraits/GlobalVariableGroup.java
rename to gen/org/moosetechnology/model/famix/famixtraits/GlobalVariableGroup.java
index 0477f94c..8438e4f7 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/GlobalVariableGroup.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/GlobalVariableGroup.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moose.SpecializedGroup;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moose.SpecializedGroup;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/InvocationGroup.java b/gen/org/moosetechnology/model/famix/famixtraits/InvocationGroup.java
similarity index 67%
rename from src/org/moosetechnology/model/famixjava/famixtraits/InvocationGroup.java
rename to gen/org/moosetechnology/model/famix/famixtraits/InvocationGroup.java
index a5da84bd..f1ef82bc 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/InvocationGroup.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/InvocationGroup.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moose.SpecializedGroup;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moose.SpecializedGroup;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/MethodGroup.java b/gen/org/moosetechnology/model/famix/famixtraits/MethodGroup.java
similarity index 91%
rename from src/org/moosetechnology/model/famixjava/famixtraits/MethodGroup.java
rename to gen/org/moosetechnology/model/famix/famixtraits/MethodGroup.java
index e70c10f1..b16cf96c 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/MethodGroup.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/MethodGroup.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moose.SpecializedGroup;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moose.SpecializedGroup;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/NamespaceGroup.java b/gen/org/moosetechnology/model/famix/famixtraits/NamespaceGroup.java
similarity index 67%
rename from src/org/moosetechnology/model/famixjava/famixtraits/NamespaceGroup.java
rename to gen/org/moosetechnology/model/famix/famixtraits/NamespaceGroup.java
index fcbb41d7..0b4bea22 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/NamespaceGroup.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/NamespaceGroup.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moose.SpecializedGroup;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moose.SpecializedGroup;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/PackageGroup.java b/gen/org/moosetechnology/model/famix/famixtraits/PackageGroup.java
similarity index 67%
rename from src/org/moosetechnology/model/famixjava/famixtraits/PackageGroup.java
rename to gen/org/moosetechnology/model/famix/famixtraits/PackageGroup.java
index 7af7bc90..8ddc0289 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/PackageGroup.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/PackageGroup.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moose.SpecializedGroup;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moose.SpecializedGroup;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TAccess.java b/gen/org/moosetechnology/model/famix/famixtraits/TAccess.java
similarity index 86%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TAccess.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TAccess.java
index 35074622..47b97e93 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TAccess.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TAccess.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TAccessible.java b/gen/org/moosetechnology/model/famix/famixtraits/TAccessible.java
similarity index 96%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TAccessible.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TAccessible.java
index 2d3f29ec..8436fa0b 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TAccessible.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TAccessible.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TAnnotationInstance.java b/gen/org/moosetechnology/model/famix/famixtraits/TAnnotationInstance.java
similarity index 79%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TAnnotationInstance.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TAnnotationInstance.java
index 6e81913f..c6c37689 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TAnnotationInstance.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TAnnotationInstance.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TAnnotationInstanceAttribute.java b/gen/org/moosetechnology/model/famix/famixtraits/TAnnotationInstanceAttribute.java
similarity index 83%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TAnnotationInstanceAttribute.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TAnnotationInstanceAttribute.java
index ccff8267..2fe2ca98 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TAnnotationInstanceAttribute.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TAnnotationInstanceAttribute.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TAnnotationType.java b/gen/org/moosetechnology/model/famix/famixtraits/TAnnotationType.java
similarity index 95%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TAnnotationType.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TAnnotationType.java
index 6847fd60..b7f8a2b8 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TAnnotationType.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TAnnotationType.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TAnnotationTypeAttribute.java b/gen/org/moosetechnology/model/famix/famixtraits/TAnnotationTypeAttribute.java
similarity index 90%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TAnnotationTypeAttribute.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TAnnotationTypeAttribute.java
index af8ad9f9..09b19043 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TAnnotationTypeAttribute.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TAnnotationTypeAttribute.java
@@ -1,11 +1,12 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import java.util.*;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TAssociation.java b/gen/org/moosetechnology/model/famix/famixtraits/TAssociation.java
similarity index 81%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TAssociation.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TAssociation.java
index 6a39d32b..39e8fe4b 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TAssociation.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TAssociation.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TAttribute.java b/gen/org/moosetechnology/model/famix/famixtraits/TAttribute.java
similarity index 84%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TAttribute.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TAttribute.java
index 255addce..49568824 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TAttribute.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TAttribute.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TCanBeAbstract.java b/gen/org/moosetechnology/model/famix/famixtraits/TCanBeAbstract.java
similarity index 87%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TCanBeAbstract.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TCanBeAbstract.java
index cdc7d27f..b0bcd35a 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TCanBeAbstract.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TCanBeAbstract.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TCanBeClassSide.java b/gen/org/moosetechnology/model/famix/famixtraits/TCanBeClassSide.java
similarity index 87%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TCanBeClassSide.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TCanBeClassSide.java
index 9ec7ff84..905c7e17 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TCanBeClassSide.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TCanBeClassSide.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TCanBeFinal.java b/gen/org/moosetechnology/model/famix/famixtraits/TCanBeFinal.java
similarity index 87%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TCanBeFinal.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TCanBeFinal.java
index 8111b02c..eb84af0c 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TCanBeFinal.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TCanBeFinal.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TCanImplement.java b/gen/org/moosetechnology/model/famix/famixtraits/TCanImplement.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TCanImplement.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TCanImplement.java
index abcab355..969dec3c 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TCanImplement.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TCanImplement.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TClass.java b/gen/org/moosetechnology/model/famix/famixtraits/TClass.java
similarity index 82%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TClass.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TClass.java
index 88faa7b7..864a5921 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TClass.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TClass.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TClassHierarchyNavigation.java b/gen/org/moosetechnology/model/famix/famixtraits/TClassHierarchyNavigation.java
similarity index 82%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TClassHierarchyNavigation.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TClassHierarchyNavigation.java
index 3d3886f3..a8cbe8ad 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TClassHierarchyNavigation.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TClassHierarchyNavigation.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TClassMetrics.java b/gen/org/moosetechnology/model/famix/famixtraits/TClassMetrics.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TClassMetrics.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TClassMetrics.java
index a2ac7fba..3e7c711e 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TClassMetrics.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TClassMetrics.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TClassWithVisibility.java b/gen/org/moosetechnology/model/famix/famixtraits/TClassWithVisibility.java
similarity index 76%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TClassWithVisibility.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TClassWithVisibility.java
index b6cca4ae..39b43c9e 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TClassWithVisibility.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TClassWithVisibility.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TCohesionCouplingMetrics.java b/gen/org/moosetechnology/model/famix/famixtraits/TCohesionCouplingMetrics.java
similarity index 87%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TCohesionCouplingMetrics.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TCohesionCouplingMetrics.java
index 6613bf45..716d4842 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TCohesionCouplingMetrics.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TCohesionCouplingMetrics.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TComment.java b/gen/org/moosetechnology/model/famix/famixtraits/TComment.java
similarity index 90%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TComment.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TComment.java
index 89029ba7..899d2dee 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TComment.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TComment.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TCompilationUnit.java b/gen/org/moosetechnology/model/famix/famixtraits/TCompilationUnit.java
similarity index 90%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TCompilationUnit.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TCompilationUnit.java
index 69bfc899..a186acd7 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TCompilationUnit.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TCompilationUnit.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TDefinedInModule.java b/gen/org/moosetechnology/model/famix/famixtraits/TDefinedInModule.java
similarity index 88%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TDefinedInModule.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TDefinedInModule.java
index f5b91dcb..36ff4689 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TDefinedInModule.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TDefinedInModule.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TDereferencedInvocation.java b/gen/org/moosetechnology/model/famix/famixtraits/TDereferencedInvocation.java
similarity index 80%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TDereferencedInvocation.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TDereferencedInvocation.java
index 142eb9dd..98ba6cce 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TDereferencedInvocation.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TDereferencedInvocation.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TEnum.java b/gen/org/moosetechnology/model/famix/famixtraits/TEnum.java
similarity index 69%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TEnum.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TEnum.java
index f6747295..d9f016f0 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TEnum.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TEnum.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TEnumValue.java b/gen/org/moosetechnology/model/famix/famixtraits/TEnumValue.java
similarity index 88%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TEnumValue.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TEnumValue.java
index a30f6714..8421c0fb 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TEnumValue.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TEnumValue.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TException.java b/gen/org/moosetechnology/model/famix/famixtraits/TException.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TException.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TException.java
index 41178ad8..a55e2235 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TException.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TException.java
@@ -1,11 +1,12 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import java.util.*;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TFile.java b/gen/org/moosetechnology/model/famix/famixtraits/TFile.java
similarity index 96%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TFile.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TFile.java
index 6e03b2f3..87d7c635 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TFile.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TFile.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TFileAnchor.java b/gen/org/moosetechnology/model/famix/famixtraits/TFileAnchor.java
similarity index 91%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TFileAnchor.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TFileAnchor.java
index 5b437571..37e2cef4 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TFileAnchor.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TFileAnchor.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TFileInclude.java b/gen/org/moosetechnology/model/famix/famixtraits/TFileInclude.java
similarity index 82%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TFileInclude.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TFileInclude.java
index 0e02d472..87827fea 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TFileInclude.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TFileInclude.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TFileNavigation.java b/gen/org/moosetechnology/model/famix/famixtraits/TFileNavigation.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TFileNavigation.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TFileNavigation.java
index c2090191..e11afdca 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TFileNavigation.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TFileNavigation.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TFileSystemEntity.java b/gen/org/moosetechnology/model/famix/famixtraits/TFileSystemEntity.java
similarity index 91%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TFileSystemEntity.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TFileSystemEntity.java
index 7ef1ea3a..054aa179 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TFileSystemEntity.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TFileSystemEntity.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TFolder.java b/gen/org/moosetechnology/model/famix/famixtraits/TFolder.java
similarity index 96%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TFolder.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TFolder.java
index 09add778..e9c58f9b 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TFolder.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TFolder.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TFunction.java b/gen/org/moosetechnology/model/famix/famixtraits/TFunction.java
similarity index 82%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TFunction.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TFunction.java
index 31abb559..da6ba621 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TFunction.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TFunction.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TGlobalVariable.java b/gen/org/moosetechnology/model/famix/famixtraits/TGlobalVariable.java
similarity index 80%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TGlobalVariable.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TGlobalVariable.java
index 99d82757..c2a0de7d 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TGlobalVariable.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TGlobalVariable.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/THasImmediateSource.java b/gen/org/moosetechnology/model/famix/famixtraits/THasImmediateSource.java
similarity index 87%
rename from src/org/moosetechnology/model/famixjava/famixtraits/THasImmediateSource.java
rename to gen/org/moosetechnology/model/famix/famixtraits/THasImmediateSource.java
index 971699dc..65409bdf 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/THasImmediateSource.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/THasImmediateSource.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/THasKind.java b/gen/org/moosetechnology/model/famix/famixtraits/THasKind.java
similarity index 92%
rename from src/org/moosetechnology/model/famixjava/famixtraits/THasKind.java
rename to gen/org/moosetechnology/model/famix/famixtraits/THasKind.java
index 86517a8f..d14adf96 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/THasKind.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/THasKind.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/THasModifiers.java b/gen/org/moosetechnology/model/famix/famixtraits/THasModifiers.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/THasModifiers.java
rename to gen/org/moosetechnology/model/famix/famixtraits/THasModifiers.java
index 7e7d396a..fded1db7 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/THasModifiers.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/THasModifiers.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/THasSignature.java b/gen/org/moosetechnology/model/famix/famixtraits/THasSignature.java
similarity index 87%
rename from src/org/moosetechnology/model/famixjava/famixtraits/THasSignature.java
rename to gen/org/moosetechnology/model/famix/famixtraits/THasSignature.java
index 4ac309f3..d94a4966 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/THasSignature.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/THasSignature.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/THasVisibility.java b/gen/org/moosetechnology/model/famix/famixtraits/THasVisibility.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixtraits/THasVisibility.java
rename to gen/org/moosetechnology/model/famix/famixtraits/THasVisibility.java
index 994451cd..09c02e9a 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/THasVisibility.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/THasVisibility.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/THeader.java b/gen/org/moosetechnology/model/famix/famixtraits/THeader.java
similarity index 88%
rename from src/org/moosetechnology/model/famixjava/famixtraits/THeader.java
rename to gen/org/moosetechnology/model/famix/famixtraits/THeader.java
index 9dd92e94..9743bc69 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/THeader.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/THeader.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TImplementable.java b/gen/org/moosetechnology/model/famix/famixtraits/TImplementable.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TImplementable.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TImplementable.java
index a3f45daa..610cc1fa 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TImplementable.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TImplementable.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TImplementation.java b/gen/org/moosetechnology/model/famix/famixtraits/TImplementation.java
similarity index 83%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TImplementation.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TImplementation.java
index 8e37b520..a8d06a84 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TImplementation.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TImplementation.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TImplicitVariable.java b/gen/org/moosetechnology/model/famix/famixtraits/TImplicitVariable.java
similarity index 82%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TImplicitVariable.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TImplicitVariable.java
index 6f32ac99..5623d2cd 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TImplicitVariable.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TImplicitVariable.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TIndexedFileNavigation.java b/gen/org/moosetechnology/model/famix/famixtraits/TIndexedFileNavigation.java
similarity index 90%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TIndexedFileNavigation.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TIndexedFileNavigation.java
index aa660444..ce3e1bd5 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TIndexedFileNavigation.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TIndexedFileNavigation.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TInheritance.java b/gen/org/moosetechnology/model/famix/famixtraits/TInheritance.java
similarity index 82%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TInheritance.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TInheritance.java
index 065b7bfc..7712726e 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TInheritance.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TInheritance.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TInvocable.java b/gen/org/moosetechnology/model/famix/famixtraits/TInvocable.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TInvocable.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TInvocable.java
index c5d15d17..655234ef 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TInvocable.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TInvocable.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TInvocation.java b/gen/org/moosetechnology/model/famix/famixtraits/TInvocation.java
similarity index 89%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TInvocation.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TInvocation.java
index cc7861dc..ec171f0e 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TInvocation.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TInvocation.java
@@ -1,11 +1,12 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import java.util.*;
-import org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency;
+
+import org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TInvocationsReceiver.java b/gen/org/moosetechnology/model/famix/famixtraits/TInvocationsReceiver.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TInvocationsReceiver.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TInvocationsReceiver.java
index f8584324..c74b1434 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TInvocationsReceiver.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TInvocationsReceiver.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TLCOMMetrics.java b/gen/org/moosetechnology/model/famix/famixtraits/TLCOMMetrics.java
similarity index 88%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TLCOMMetrics.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TLCOMMetrics.java
index 9537ee65..88141452 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TLCOMMetrics.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TLCOMMetrics.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TLocalVariable.java b/gen/org/moosetechnology/model/famix/famixtraits/TLocalVariable.java
similarity index 81%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TLocalVariable.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TLocalVariable.java
index 446fbdb8..a146535d 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TLocalVariable.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TLocalVariable.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TMethod.java b/gen/org/moosetechnology/model/famix/famixtraits/TMethod.java
similarity index 84%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TMethod.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TMethod.java
index 41b5f6c1..366adc79 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TMethod.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TMethod.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TMethodMetrics.java b/gen/org/moosetechnology/model/famix/famixtraits/TMethodMetrics.java
similarity index 92%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TMethodMetrics.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TMethodMetrics.java
index 4ff7da25..e707ef54 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TMethodMetrics.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TMethodMetrics.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TModule.java b/gen/org/moosetechnology/model/famix/famixtraits/TModule.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TModule.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TModule.java
index 16d74b44..d7c5ce30 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TModule.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TModule.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TMultipleFileAnchor.java b/gen/org/moosetechnology/model/famix/famixtraits/TMultipleFileAnchor.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TMultipleFileAnchor.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TMultipleFileAnchor.java
index b417f73d..2d4df1b7 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TMultipleFileAnchor.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TMultipleFileAnchor.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TNamedEntity.java b/gen/org/moosetechnology/model/famix/famixtraits/TNamedEntity.java
similarity index 86%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TNamedEntity.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TNamedEntity.java
index 8aee4006..5b5f2c1e 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TNamedEntity.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TNamedEntity.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TNamespace.java b/gen/org/moosetechnology/model/famix/famixtraits/TNamespace.java
similarity index 67%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TNamespace.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TNamespace.java
index bb0edf0c..5b694531 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TNamespace.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TNamespace.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TPackage.java b/gen/org/moosetechnology/model/famix/famixtraits/TPackage.java
similarity index 88%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TPackage.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TPackage.java
index 47f9afb1..223e929d 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TPackage.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TPackage.java
@@ -1,11 +1,12 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import java.util.*;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TPackageable.java b/gen/org/moosetechnology/model/famix/famixtraits/TPackageable.java
similarity index 88%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TPackageable.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TPackageable.java
index 2fc59e3f..0b1db6fe 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TPackageable.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TPackageable.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TParameter.java b/gen/org/moosetechnology/model/famix/famixtraits/TParameter.java
similarity index 81%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TParameter.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TParameter.java
index 68550966..b2f03470 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TParameter.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TParameter.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TParameterType.java b/gen/org/moosetechnology/model/famix/famixtraits/TParameterType.java
similarity index 80%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TParameterType.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TParameterType.java
index 34c4f79b..0b896d0c 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TParameterType.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TParameterType.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TParameterizedType.java b/gen/org/moosetechnology/model/famix/famixtraits/TParameterizedType.java
similarity index 90%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TParameterizedType.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TParameterizedType.java
index 9d31b991..0de7f6af 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TParameterizedType.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TParameterizedType.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TParameterizedTypeUser.java b/gen/org/moosetechnology/model/famix/famixtraits/TParameterizedTypeUser.java
similarity index 95%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TParameterizedTypeUser.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TParameterizedTypeUser.java
index 3c1cd01b..3afd3143 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TParameterizedTypeUser.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TParameterizedTypeUser.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TPreprocessorDefine.java b/gen/org/moosetechnology/model/famix/famixtraits/TPreprocessorDefine.java
similarity index 81%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TPreprocessorDefine.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TPreprocessorDefine.java
index 7c6a7acc..1afc9dca 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TPreprocessorDefine.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TPreprocessorDefine.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TPreprocessorIfdef.java b/gen/org/moosetechnology/model/famix/famixtraits/TPreprocessorIfdef.java
similarity index 81%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TPreprocessorIfdef.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TPreprocessorIfdef.java
index f96b7a91..2c32c6ab 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TPreprocessorIfdef.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TPreprocessorIfdef.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TPrimitiveType.java b/gen/org/moosetechnology/model/famix/famixtraits/TPrimitiveType.java
similarity index 69%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TPrimitiveType.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TPrimitiveType.java
index 6f27fee5..ecd55c05 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TPrimitiveType.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TPrimitiveType.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TReference.java b/gen/org/moosetechnology/model/famix/famixtraits/TReference.java
similarity index 82%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TReference.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TReference.java
index 223ad503..be4eb44a 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TReference.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TReference.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TReferenceable.java b/gen/org/moosetechnology/model/famix/famixtraits/TReferenceable.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TReferenceable.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TReferenceable.java
index 5851b4d4..761cb4fa 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TReferenceable.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TReferenceable.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TRelativeSourceAnchor.java b/gen/org/moosetechnology/model/famix/famixtraits/TRelativeSourceAnchor.java
similarity index 92%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TRelativeSourceAnchor.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TRelativeSourceAnchor.java
index 227f003d..4a08a12d 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TRelativeSourceAnchor.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TRelativeSourceAnchor.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TSourceAnchor.java b/gen/org/moosetechnology/model/famix/famixtraits/TSourceAnchor.java
similarity index 90%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TSourceAnchor.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TSourceAnchor.java
index ddaab093..f9664f85 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TSourceAnchor.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TSourceAnchor.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TSourceEntity.java b/gen/org/moosetechnology/model/famix/famixtraits/TSourceEntity.java
similarity index 90%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TSourceEntity.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TSourceEntity.java
index 1bf07271..4b203d64 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TSourceEntity.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TSourceEntity.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.famixreplication.Replica;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.famixreplication.Replica;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TSourceLanguage.java b/gen/org/moosetechnology/model/famix/famixtraits/TSourceLanguage.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TSourceLanguage.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TSourceLanguage.java
index d5ec7b12..17787642 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TSourceLanguage.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TSourceLanguage.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TStructuralEntity.java b/gen/org/moosetechnology/model/famix/famixtraits/TStructuralEntity.java
similarity index 70%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TStructuralEntity.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TStructuralEntity.java
index 9299f168..962c5d85 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TStructuralEntity.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TStructuralEntity.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TTemplate.java b/gen/org/moosetechnology/model/famix/famixtraits/TTemplate.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TTemplate.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TTemplate.java
index 7751e469..cbdc2721 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TTemplate.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TTemplate.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TTemplateUser.java b/gen/org/moosetechnology/model/famix/famixtraits/TTemplateUser.java
similarity index 88%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TTemplateUser.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TTemplateUser.java
index b14a2ca0..d2b24412 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TTemplateUser.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TTemplateUser.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TTrait.java b/gen/org/moosetechnology/model/famix/famixtraits/TTrait.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TTrait.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TTrait.java
index fbf76645..132ceab8 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TTrait.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TTrait.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TTraitUsage.java b/gen/org/moosetechnology/model/famix/famixtraits/TTraitUsage.java
similarity index 81%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TTraitUsage.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TTraitUsage.java
index a31e5d0b..63659c69 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TTraitUsage.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TTraitUsage.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TTraitUser.java b/gen/org/moosetechnology/model/famix/famixtraits/TTraitUser.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TTraitUser.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TTraitUser.java
index fb93da7e..485d3b49 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TTraitUser.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TTraitUser.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TType.java b/gen/org/moosetechnology/model/famix/famixtraits/TType.java
similarity index 88%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TType.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TType.java
index f8fee741..523558dd 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TType.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TType.java
@@ -1,11 +1,12 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import java.util.*;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TTypeAlias.java b/gen/org/moosetechnology/model/famix/famixtraits/TTypeAlias.java
similarity index 88%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TTypeAlias.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TTypeAlias.java
index 24af3ff3..50856b7c 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TTypeAlias.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TTypeAlias.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TTypedAnnotationInstance.java b/gen/org/moosetechnology/model/famix/famixtraits/TTypedAnnotationInstance.java
similarity index 89%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TTypedAnnotationInstance.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TTypedAnnotationInstance.java
index ebd53f4c..bfcd46ad 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TTypedAnnotationInstance.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TTypedAnnotationInstance.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TTypedAnnotationInstanceAttribute.java b/gen/org/moosetechnology/model/famix/famixtraits/TTypedAnnotationInstanceAttribute.java
similarity index 90%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TTypedAnnotationInstanceAttribute.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TTypedAnnotationInstanceAttribute.java
index 916c015d..d2872336 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TTypedAnnotationInstanceAttribute.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TTypedAnnotationInstanceAttribute.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TTypedEntity.java b/gen/org/moosetechnology/model/famix/famixtraits/TTypedEntity.java
similarity index 88%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TTypedEntity.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TTypedEntity.java
index 13a5c1cc..23fb1691 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TTypedEntity.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TTypedEntity.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TUnknownSourceLanguage.java b/gen/org/moosetechnology/model/famix/famixtraits/TUnknownSourceLanguage.java
similarity index 82%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TUnknownSourceLanguage.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TUnknownSourceLanguage.java
index 06446110..ec4a47b7 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TUnknownSourceLanguage.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TUnknownSourceLanguage.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TUnknownVariable.java b/gen/org/moosetechnology/model/famix/famixtraits/TUnknownVariable.java
similarity index 71%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TUnknownVariable.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TUnknownVariable.java
index 09f71dbe..a95539cd 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TUnknownVariable.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TUnknownVariable.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithAccesses.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithAccesses.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithAccesses.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithAccesses.java
index 79fd991b..dded3912 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithAccesses.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithAccesses.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithAnnotationInstanceAttributes.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithAnnotationInstanceAttributes.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithAnnotationInstanceAttributes.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithAnnotationInstanceAttributes.java
index f4aa67f1..4e39f17e 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithAnnotationInstanceAttributes.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithAnnotationInstanceAttributes.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithAnnotationInstances.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithAnnotationInstances.java
similarity index 95%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithAnnotationInstances.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithAnnotationInstances.java
index 427ee65f..38cb54e6 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithAnnotationInstances.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithAnnotationInstances.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithAnnotationTypes.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithAnnotationTypes.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithAnnotationTypes.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithAnnotationTypes.java
index ebcede3e..576ddef2 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithAnnotationTypes.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithAnnotationTypes.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithAttributes.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithAttributes.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithAttributes.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithAttributes.java
index 7335e98f..1fcc93b4 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithAttributes.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithAttributes.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithClasses.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithClasses.java
similarity index 87%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithClasses.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithClasses.java
index f7001143..40eb3e44 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithClasses.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithClasses.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithComments.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithComments.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithComments.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithComments.java
index 9b070821..5acd4d41 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithComments.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithComments.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithCompilationUnits.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithCompilationUnits.java
similarity index 89%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithCompilationUnits.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithCompilationUnits.java
index c59debc7..fe85ff0c 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithCompilationUnits.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithCompilationUnits.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithDereferencedInvocations.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithDereferencedInvocations.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithDereferencedInvocations.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithDereferencedInvocations.java
index 7ce397ca..0eea3f89 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithDereferencedInvocations.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithDereferencedInvocations.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithEnumValues.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithEnumValues.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithEnumValues.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithEnumValues.java
index be670227..5e2a96d4 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithEnumValues.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithEnumValues.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithExceptions.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithExceptions.java
similarity index 97%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithExceptions.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithExceptions.java
index cf218eb7..be401582 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithExceptions.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithExceptions.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithFileIncludes.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithFileIncludes.java
similarity index 96%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithFileIncludes.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithFileIncludes.java
index 281430e0..635d20ee 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithFileIncludes.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithFileIncludes.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithFiles.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithFiles.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithFiles.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithFiles.java
index 74883e13..c2c6426a 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithFiles.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithFiles.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithFunctions.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithFunctions.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithFunctions.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithFunctions.java
index bd63136c..2130486b 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithFunctions.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithFunctions.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithGlobalVariables.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithGlobalVariables.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithGlobalVariables.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithGlobalVariables.java
index ac2404bb..75502432 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithGlobalVariables.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithGlobalVariables.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithHeaders.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithHeaders.java
similarity index 88%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithHeaders.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithHeaders.java
index 002979fb..6806a686 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithHeaders.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithHeaders.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithImplicitVariables.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithImplicitVariables.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithImplicitVariables.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithImplicitVariables.java
index 205facda..92db5ca9 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithImplicitVariables.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithImplicitVariables.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithInheritances.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithInheritances.java
similarity index 97%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithInheritances.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithInheritances.java
index f36c46f8..2987bb61 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithInheritances.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithInheritances.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithInvocations.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithInvocations.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithInvocations.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithInvocations.java
index c1baf420..ee7f84d4 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithInvocations.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithInvocations.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithLocalVariables.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithLocalVariables.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithLocalVariables.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithLocalVariables.java
index f8113a7c..3594af80 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithLocalVariables.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithLocalVariables.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithMethods.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithMethods.java
similarity index 95%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithMethods.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithMethods.java
index 32428945..86837375 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithMethods.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithMethods.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithPackages.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithPackages.java
similarity index 80%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithPackages.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithPackages.java
index 99647ac1..beb6bcbd 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithPackages.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithPackages.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithParameterizedTypeUsers.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithParameterizedTypeUsers.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithParameterizedTypeUsers.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithParameterizedTypeUsers.java
index ba3275d0..684914c3 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithParameterizedTypeUsers.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithParameterizedTypeUsers.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithParameterizedTypes.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithParameterizedTypes.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithParameterizedTypes.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithParameterizedTypes.java
index 4a297e7a..3bbf3c76 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithParameterizedTypes.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithParameterizedTypes.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithParameters.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithParameters.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithParameters.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithParameters.java
index 9b3f14a7..082ad5bf 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithParameters.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithParameters.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithReferences.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithReferences.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithReferences.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithReferences.java
index 636027b7..f99c98a6 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithReferences.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithReferences.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithSourceLanguages.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithSourceLanguages.java
similarity index 89%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithSourceLanguages.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithSourceLanguages.java
index 7859a4c2..118d646b 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithSourceLanguages.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithSourceLanguages.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithStatements.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithStatements.java
similarity index 88%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithStatements.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithStatements.java
index 9fffb9f0..2c185b41 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithStatements.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithStatements.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithTemplates.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithTemplates.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithTemplates.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithTemplates.java
index 71da14e2..834c328e 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithTemplates.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithTemplates.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithTraits.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithTraits.java
similarity index 92%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithTraits.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithTraits.java
index a736462d..2dfdf3da 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithTraits.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithTraits.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithTypeAliases.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithTypeAliases.java
similarity index 93%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithTypeAliases.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithTypeAliases.java
index 5fe7d630..cefb8428 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithTypeAliases.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithTypeAliases.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TWithTypes.java b/gen/org/moosetechnology/model/famix/famixtraits/TWithTypes.java
similarity index 92%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TWithTypes.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TWithTypes.java
index e46f18ec..b5b20369 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TWithTypes.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TWithTypes.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/TypeGroup.java b/gen/org/moosetechnology/model/famix/famixtraits/TypeGroup.java
similarity index 95%
rename from src/org/moosetechnology/model/famixjava/famixtraits/TypeGroup.java
rename to gen/org/moosetechnology/model/famix/famixtraits/TypeGroup.java
index a406131f..382c4e31 100644
--- a/src/org/moosetechnology/model/famixjava/famixtraits/TypeGroup.java
+++ b/gen/org/moosetechnology/model/famix/famixtraits/TypeGroup.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
+package org.moosetechnology.model.famix.famixtraits;
+
+import org.moosetechnology.model.famix.moose.SpecializedGroup;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moose.SpecializedGroup;
@FamePackage("Famix-Traits")
diff --git a/src/org/moosetechnology/model/famixjava/moose/AbstractGroup.java b/gen/org/moosetechnology/model/famix/moose/AbstractGroup.java
similarity index 97%
rename from src/org/moosetechnology/model/famixjava/moose/AbstractGroup.java
rename to gen/org/moosetechnology/model/famix/moose/AbstractGroup.java
index de130ef2..0cc09591 100644
--- a/src/org/moosetechnology/model/famixjava/moose/AbstractGroup.java
+++ b/gen/org/moosetechnology/model/famix/moose/AbstractGroup.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.moose;
+package org.moosetechnology.model.famix.moose;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/moose/Entity.java b/gen/org/moosetechnology/model/famix/moose/Entity.java
similarity index 96%
rename from src/org/moosetechnology/model/famixjava/moose/Entity.java
rename to gen/org/moosetechnology/model/famix/moose/Entity.java
index 60a7344d..5c15e216 100644
--- a/src/org/moosetechnology/model/famixjava/moose/Entity.java
+++ b/gen/org/moosetechnology/model/famix/moose/Entity.java
@@ -1,12 +1,13 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.moose;
+package org.moosetechnology.model.famix.moose;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.tagging.Association;
+
+import org.moosetechnology.model.famix.tagging.Association;
@FamePackage("Moose")
diff --git a/src/org/moosetechnology/model/famixjava/moose/Group.java b/gen/org/moosetechnology/model/famix/moose/Group.java
similarity index 81%
rename from src/org/moosetechnology/model/famixjava/moose/Group.java
rename to gen/org/moosetechnology/model/famix/moose/Group.java
index 139e818b..73f897f1 100644
--- a/src/org/moosetechnology/model/famixjava/moose/Group.java
+++ b/gen/org/moosetechnology/model/famix/moose/Group.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.moose;
+package org.moosetechnology.model.famix.moose;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/moose/Model.java b/gen/org/moosetechnology/model/famix/moose/Model.java
similarity index 96%
rename from src/org/moosetechnology/model/famixjava/moose/Model.java
rename to gen/org/moosetechnology/model/famix/moose/Model.java
index 3843408f..56a12e5f 100644
--- a/src/org/moosetechnology/model/famixjava/moose/Model.java
+++ b/gen/org/moosetechnology/model/famix/moose/Model.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.moose;
+package org.moosetechnology.model.famix.moose;
+
+import org.moosetechnology.model.famix.famixtraits.TSourceLanguage;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceLanguage;
@FamePackage("Moose")
diff --git a/gen/org/moosetechnology/model/famix/moose/MooseModel.java b/gen/org/moosetechnology/model/famix/moose/MooseModel.java
new file mode 100644
index 00000000..bd78a78e
--- /dev/null
+++ b/gen/org/moosetechnology/model/famix/moose/MooseModel.java
@@ -0,0 +1,26 @@
+// Automagically generated code, please do not change
+package org.moosetechnology.model.famix.moose;
+
+import ch.akuhn.fame.MetaRepository;
+
+public class MooseModel {
+
+ public static MetaRepository metamodel() {
+ MetaRepository metamodel = new MetaRepository();
+ importInto(metamodel);
+ return metamodel;
+ }
+
+ public static void importInto(MetaRepository metamodel) {
+ metamodel.with(org.moosetechnology.model.famix.moose.AbstractGroup.class);
+ metamodel.with(org.moosetechnology.model.famix.moose.Entity.class);
+ metamodel.with(org.moosetechnology.model.famix.moose.Group.class);
+ metamodel.with(org.moosetechnology.model.famix.moose.Model.class);
+ metamodel.with(org.moosetechnology.model.famix.moose.Object.class);
+ metamodel.with(org.moosetechnology.model.famix.moose.PropertyGroup.class);
+ metamodel.with(org.moosetechnology.model.famix.moose.SpecializedGroup.class);
+
+ }
+
+}
+
diff --git a/src/org/moosetechnology/model/famixjava/moose/Object.java b/gen/org/moosetechnology/model/famix/moose/Object.java
similarity index 80%
rename from src/org/moosetechnology/model/famixjava/moose/Object.java
rename to gen/org/moosetechnology/model/famix/moose/Object.java
index c2c946a2..6b7682ba 100644
--- a/src/org/moosetechnology/model/famixjava/moose/Object.java
+++ b/gen/org/moosetechnology/model/famix/moose/Object.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.moose;
+package org.moosetechnology.model.famix.moose;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/moose/PropertyGroup.java b/gen/org/moosetechnology/model/famix/moose/PropertyGroup.java
similarity index 97%
rename from src/org/moosetechnology/model/famixjava/moose/PropertyGroup.java
rename to gen/org/moosetechnology/model/famix/moose/PropertyGroup.java
index 8b6f0ff3..ad414eb2 100644
--- a/src/org/moosetechnology/model/famixjava/moose/PropertyGroup.java
+++ b/gen/org/moosetechnology/model/famix/moose/PropertyGroup.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.moose;
+package org.moosetechnology.model.famix.moose;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/moose/SpecializedGroup.java b/gen/org/moosetechnology/model/famix/moose/SpecializedGroup.java
similarity index 82%
rename from src/org/moosetechnology/model/famixjava/moose/SpecializedGroup.java
rename to gen/org/moosetechnology/model/famix/moose/SpecializedGroup.java
index e656c3de..234337b7 100644
--- a/src/org/moosetechnology/model/famixjava/moose/SpecializedGroup.java
+++ b/gen/org/moosetechnology/model/famix/moose/SpecializedGroup.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.moose;
+package org.moosetechnology.model.famix.moose;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/moosequery/MooseQueryModel.java b/gen/org/moosetechnology/model/famix/moosequery/MooseQueryModel.java
similarity index 58%
rename from src/org/moosetechnology/model/famixjava/moosequery/MooseQueryModel.java
rename to gen/org/moosetechnology/model/famix/moosequery/MooseQueryModel.java
index 5f9293a0..d188adc5 100644
--- a/src/org/moosetechnology/model/famixjava/moosequery/MooseQueryModel.java
+++ b/gen/org/moosetechnology/model/famix/moosequery/MooseQueryModel.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.moosequery;
+package org.moosetechnology.model.famix.moosequery;
import ch.akuhn.fame.MetaRepository;
@@ -12,8 +12,8 @@ public static MetaRepository metamodel() {
}
public static void importInto(MetaRepository metamodel) {
- metamodel.with(org.moosetechnology.model.famixjava.moosequery.TAssociationMetaLevelDependency.class);
- metamodel.with(org.moosetechnology.model.famixjava.moosequery.TEntityMetaLevelDependency.class);
+ metamodel.with(org.moosetechnology.model.famix.moosequery.TAssociationMetaLevelDependency.class);
+ metamodel.with(org.moosetechnology.model.famix.moosequery.TEntityMetaLevelDependency.class);
}
diff --git a/src/org/moosetechnology/model/famixjava/moosequery/TAssociationMetaLevelDependency.java b/gen/org/moosetechnology/model/famix/moosequery/TAssociationMetaLevelDependency.java
similarity index 82%
rename from src/org/moosetechnology/model/famixjava/moosequery/TAssociationMetaLevelDependency.java
rename to gen/org/moosetechnology/model/famix/moosequery/TAssociationMetaLevelDependency.java
index fed7c515..22e31ad0 100644
--- a/src/org/moosetechnology/model/famixjava/moosequery/TAssociationMetaLevelDependency.java
+++ b/gen/org/moosetechnology/model/famix/moosequery/TAssociationMetaLevelDependency.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.moosequery;
+package org.moosetechnology.model.famix.moosequery;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/moosequery/TEntityMetaLevelDependency.java b/gen/org/moosetechnology/model/famix/moosequery/TEntityMetaLevelDependency.java
similarity index 95%
rename from src/org/moosetechnology/model/famixjava/moosequery/TEntityMetaLevelDependency.java
rename to gen/org/moosetechnology/model/famix/moosequery/TEntityMetaLevelDependency.java
index 5169fd6b..9cc07122 100644
--- a/src/org/moosetechnology/model/famixjava/moosequery/TEntityMetaLevelDependency.java
+++ b/gen/org/moosetechnology/model/famix/moosequery/TEntityMetaLevelDependency.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.moosequery;
+package org.moosetechnology.model.famix.moosequery;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/tagging/Association.java b/gen/org/moosetechnology/model/famix/tagging/Association.java
similarity index 91%
rename from src/org/moosetechnology/model/famixjava/tagging/Association.java
rename to gen/org/moosetechnology/model/famix/tagging/Association.java
index 966fcded..11528ee1 100644
--- a/src/org/moosetechnology/model/famixjava/tagging/Association.java
+++ b/gen/org/moosetechnology/model/famix/tagging/Association.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.tagging;
+package org.moosetechnology.model.famix.tagging;
+
+import org.moosetechnology.model.famix.moose.Entity;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.moose.Entity;
@FamePackage("Tagging")
diff --git a/src/org/moosetechnology/model/famixjava/tagging/Category.java b/gen/org/moosetechnology/model/famix/tagging/Category.java
similarity index 94%
rename from src/org/moosetechnology/model/famixjava/tagging/Category.java
rename to gen/org/moosetechnology/model/famix/tagging/Category.java
index 4d031cdb..645080f8 100644
--- a/src/org/moosetechnology/model/famixjava/tagging/Category.java
+++ b/gen/org/moosetechnology/model/famix/tagging/Category.java
@@ -1,12 +1,13 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.tagging;
+package org.moosetechnology.model.famix.tagging;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.moose.Entity;
+
+import org.moosetechnology.model.famix.moose.Entity;
@FamePackage("Tagging")
diff --git a/src/org/moosetechnology/model/famixjava/tagging/EntityAssociation.java b/gen/org/moosetechnology/model/famix/tagging/EntityAssociation.java
similarity index 82%
rename from src/org/moosetechnology/model/famixjava/tagging/EntityAssociation.java
rename to gen/org/moosetechnology/model/famix/tagging/EntityAssociation.java
index b6b92c41..ba32e80c 100644
--- a/src/org/moosetechnology/model/famixjava/tagging/EntityAssociation.java
+++ b/gen/org/moosetechnology/model/famix/tagging/EntityAssociation.java
@@ -1,5 +1,5 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.tagging;
+package org.moosetechnology.model.famix.tagging;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
diff --git a/src/org/moosetechnology/model/famixjava/tagging/IntervalAssociation.java b/gen/org/moosetechnology/model/famix/tagging/IntervalAssociation.java
similarity index 88%
rename from src/org/moosetechnology/model/famixjava/tagging/IntervalAssociation.java
rename to gen/org/moosetechnology/model/famix/tagging/IntervalAssociation.java
index 16ca6261..d4c8d877 100644
--- a/src/org/moosetechnology/model/famixjava/tagging/IntervalAssociation.java
+++ b/gen/org/moosetechnology/model/famix/tagging/IntervalAssociation.java
@@ -1,10 +1,11 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.tagging;
+package org.moosetechnology.model.famix.tagging;
+
+import org.moosetechnology.model.famix.famixtraits.TSourceAnchor;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor;
@FamePackage("Tagging")
diff --git a/src/org/moosetechnology/model/famixjava/tagging/Tag.java b/gen/org/moosetechnology/model/famix/tagging/Tag.java
similarity index 97%
rename from src/org/moosetechnology/model/famixjava/tagging/Tag.java
rename to gen/org/moosetechnology/model/famix/tagging/Tag.java
index 898fb0d3..d01b2f81 100644
--- a/src/org/moosetechnology/model/famixjava/tagging/Tag.java
+++ b/gen/org/moosetechnology/model/famix/tagging/Tag.java
@@ -1,12 +1,13 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.tagging;
+package org.moosetechnology.model.famix.tagging;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
import ch.akuhn.fame.FameProperty;
import ch.akuhn.fame.internal.MultivalueSet;
import java.util.*;
-import org.moosetechnology.model.famixjava.moose.Entity;
+
+import org.moosetechnology.model.famix.moose.Entity;
@FamePackage("Tagging")
diff --git a/src/org/moosetechnology/model/famixjava/tagging/TagModel.java b/gen/org/moosetechnology/model/famix/tagging/TagModel.java
similarity index 66%
rename from src/org/moosetechnology/model/famixjava/tagging/TagModel.java
rename to gen/org/moosetechnology/model/famix/tagging/TagModel.java
index cb9e323e..5388c4fe 100644
--- a/src/org/moosetechnology/model/famixjava/tagging/TagModel.java
+++ b/gen/org/moosetechnology/model/famix/tagging/TagModel.java
@@ -1,9 +1,10 @@
// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.tagging;
+package org.moosetechnology.model.famix.tagging;
+
+import org.moosetechnology.model.famix.moose.AbstractGroup;
import ch.akuhn.fame.FameDescription;
import ch.akuhn.fame.FamePackage;
-import org.moosetechnology.model.famixjava.moose.AbstractGroup;
@FamePackage("Tagging")
diff --git a/gen/org/moosetechnology/model/famix/tagging/TaggingModel.java b/gen/org/moosetechnology/model/famix/tagging/TaggingModel.java
new file mode 100644
index 00000000..fa5bd7f6
--- /dev/null
+++ b/gen/org/moosetechnology/model/famix/tagging/TaggingModel.java
@@ -0,0 +1,25 @@
+// Automagically generated code, please do not change
+package org.moosetechnology.model.famix.tagging;
+
+import ch.akuhn.fame.MetaRepository;
+
+public class TaggingModel {
+
+ public static MetaRepository metamodel() {
+ MetaRepository metamodel = new MetaRepository();
+ importInto(metamodel);
+ return metamodel;
+ }
+
+ public static void importInto(MetaRepository metamodel) {
+ metamodel.with(org.moosetechnology.model.famix.tagging.Association.class);
+ metamodel.with(org.moosetechnology.model.famix.tagging.Category.class);
+ metamodel.with(org.moosetechnology.model.famix.tagging.EntityAssociation.class);
+ metamodel.with(org.moosetechnology.model.famix.tagging.IntervalAssociation.class);
+ metamodel.with(org.moosetechnology.model.famix.tagging.Tag.class);
+ metamodel.with(org.moosetechnology.model.famix.tagging.TagModel.class);
+
+ }
+
+}
+
diff --git a/lib/verveine.extractor.java.jar b/lib/verveine.extractor.java.jar
index 5091fdb0..35529830 100644
Binary files a/lib/verveine.extractor.java.jar and b/lib/verveine.extractor.java.jar differ
diff --git a/resources/famixJava.mse b/resources/famixJava.mse
new file mode 100644
index 00000000..7a06571a
--- /dev/null
+++ b/resources/famixJava.mse
@@ -0,0 +1 @@
+(
(FM3.Package (id: 1)
(name 'Tagging')
(classes
(FM3.Class (id: 2)
(name 'Category')
(abstract false)
(package (ref: 1))
(superclass (ref: 3))
(properties
(FM3.Property (id: 4)
(name 'markedTags')
(class (ref: 2))
(container false)
(derived false)
(multivalued true)
(opposite (ref: 5))
(type (ref: 6)))
(FM3.Property (id: 7)
(name 'name')
(class (ref: 2))
(container false)
(derived false)
(multivalued false)
(type (ref: String)))))
(FM3.Class (id: 8)
(name 'Association')
(abstract true)
(package (ref: 1))
(superclass (ref: 3))
(properties
(FM3.Property (id: 9)
(name 'tag')
(class (ref: 8))
(container false)
(derived true)
(multivalued false)
(type (ref: 6)))
(FM3.Property (id: 10)
(name 'entity')
(class (ref: 8))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 11))
(type (ref: 3)))
(FM3.Property (id: 12)
(name 'tagId')
(class (ref: 8))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))))
(FM3.Class (id: 6)
(name 'Tag')
(abstract false)
(package (ref: 1))
(superclass (ref: 3))
(properties
(FM3.Property (id: 13)
(name 'serializedColor')
(class (ref: 6))
(container false)
(derived false)
(multivalued false)
(type (ref: String)))
(FM3.Property (id: 14)
(name 'description')
(class (ref: 6))
(container false)
(derived false)
(multivalued false)
(type (ref: String)))
(FM3.Property (id: 15)
(name 'children')
(class (ref: 6))
(container false)
(derived true)
(multivalued true)
(type (ref: 6)))
(FM3.Property (id: 16)
(name 'parentTag')
(class (ref: 6))
(container true)
(derived false)
(multivalued false)
(opposite (ref: 17))
(type (ref: 6)))
(FM3.Property (id: 18)
(name 'isHidden')
(class (ref: 6))
(container false)
(derived false)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 5)
(name 'categories')
(class (ref: 6))
(container false)
(derived false)
(multivalued true)
(opposite (ref: 4))
(type (ref: 2)))
(FM3.Property (id: 19)
(name 'id')
(class (ref: 6))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 17)
(name 'subTags')
(class (ref: 6))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 16))
(type (ref: 6)))
(FM3.Property (id: 20)
(name 'name')
(class (ref: 6))
(container false)
(derived false)
(multivalued false)
(type (ref: String)))))
(FM3.Class (id: 21)
(name 'EntityAssociation')
(abstract false)
(package (ref: 1))
(superclass (ref: 8)))
(FM3.Class (id: 22)
(name 'TagModel')
(abstract false)
(package (ref: 1))
(superclass (ref: 23)))
(FM3.Class (id: 24)
(name 'IntervalAssociation')
(abstract false)
(package (ref: 1))
(superclass (ref: 8))
(properties
(FM3.Property (id: 25)
(name 'start')
(class (ref: 24))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 26)
(name 'sourceAnchor')
(class (ref: 24))
(container false)
(derived false)
(multivalued false)
(type (ref: 27)))
(FM3.Property (id: 28)
(name 'stop')
(class (ref: 24))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))))))
(FM3.Package (id: 29)
(name 'Famix-Traits')
(classes
(FM3.Trait (id: 30)
(name 'TWithParameterizedTypeUsers')
(package (ref: 29))
(properties
(FM3.Property (id: 31)
(name 'arguments')
(class (ref: 30))
(container false)
(derived false)
(multivalued true)
(opposite (ref: 32))
(type (ref: 33)))))
(FM3.Trait (id: 34)
(name 'TWithInheritances')
(package (ref: 29))
(properties
(FM3.Property (id: 35)
(name 'superInheritances')
(class (ref: 34))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 36))
(type (ref: 37)))
(FM3.Property (id: 38)
(name 'subclassHierarchyDepth')
(class (ref: 34))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 39)
(name 'subInheritances')
(class (ref: 34))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 40))
(type (ref: 37)))
(FM3.Property (id: 41)
(name 'hierarchyNestingLevel')
(class (ref: 34))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 42)
(name 'numberOfSubclasses')
(class (ref: 34))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 43)
(name 'numberOfDirectSubclasses')
(class (ref: 34))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 44)
(name 'TGlobalVariable')
(package (ref: 29))
(traits (ref: 45) (ref: 46) (ref: 47) (ref: 48) (ref: 49) (ref: 50))
(properties
(FM3.Property (id: 51)
(name 'parentScope')
(class (ref: 44))
(container true)
(derived false)
(multivalued false)
(opposite (ref: 52))
(type (ref: 53)))))
(FM3.Trait (id: 54)
(name 'TMultipleFileAnchor')
(package (ref: 29))
(traits (ref: 27))
(properties
(FM3.Property (id: 55)
(name 'fileAnchors')
(class (ref: 54))
(container false)
(derived false)
(multivalued true)
(type (ref: 56)))))
(FM3.Trait (id: 57)
(name 'TTypeAlias')
(package (ref: 29))
(properties
(FM3.Property (id: 58)
(name 'aliasedType')
(class (ref: 57))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 59))
(type (ref: 60)))))
(FM3.Trait (id: 61)
(name 'TRelativeSourceAnchor')
(package (ref: 29))
(traits (ref: 27))
(properties
(FM3.Property (id: 62)
(name 'relatedAnchor')
(class (ref: 61))
(container false)
(derived false)
(multivalued false)
(type (ref: 27)))
(FM3.Property (id: 63)
(name 'endPos')
(class (ref: 61))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 64)
(name 'startPos')
(class (ref: 61))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 65)
(name 'TIndexedFileNavigation')
(package (ref: 29))
(traits (ref: 56))
(properties
(FM3.Property (id: 66)
(name 'endPos')
(class (ref: 65))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 67)
(name 'startPos')
(class (ref: 65))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 68)
(name 'TTrait')
(package (ref: 29))
(properties
(FM3.Property (id: 69)
(name 'incomingTraitUsages')
(class (ref: 68))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 70))
(type (ref: 71)))
(FM3.Property (id: 72)
(name 'traitOwner')
(class (ref: 68))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 73))
(type (ref: 74)))))
(FM3.Trait (id: 75)
(name 'TAccess')
(package (ref: 29))
(traits (ref: 47) (ref: 76) (ref: 77))
(properties
(FM3.Property (id: 78)
(name 'isWrite')
(class (ref: 75))
(container false)
(derived false)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 79)
(name 'accessor')
(class (ref: 75))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 80))
(type (ref: 81)))
(FM3.Property (id: 82)
(name 'variable')
(class (ref: 75))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 83))
(type (ref: 50)))
(FM3.Property (id: 84)
(name 'isReadWriteUnknown')
(class (ref: 75))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 85)
(name 'isRead')
(class (ref: 75))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))))
(FM3.Trait (id: 86)
(name 'TFileInclude')
(package (ref: 29))
(traits (ref: 47) (ref: 76) (ref: 77))
(properties
(FM3.Property (id: 87)
(name 'source')
(class (ref: 86))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 88))
(type (ref: 89)))
(FM3.Property (id: 90)
(name 'target')
(class (ref: 86))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 91))
(type (ref: 89)))))
(FM3.Trait (id: 92)
(name 'TWithDereferencedInvocations')
(package (ref: 29))
(properties
(FM3.Property (id: 93)
(name 'dereferencedInvocations')
(class (ref: 92))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 94))
(type (ref: 95)))))
(FM3.Trait (id: 96)
(name 'TWithFiles')
(package (ref: 29))
(properties
(FM3.Property (id: 97)
(name 'containerFiles')
(class (ref: 96))
(container false)
(derived false)
(multivalued true)
(opposite (ref: 98))
(type (ref: 99)))))
(FM3.Trait (id: 100)
(name 'TWithHeaders')
(package (ref: 29))
(properties
(FM3.Property (id: 101)
(name 'header')
(class (ref: 100))
(container false)
(derived true)
(multivalued false)
(opposite (ref: 102))
(type (ref: 103)))))
(FM3.Trait (id: 104)
(name 'THasKind')
(package (ref: 29))
(properties
(FM3.Property (id: 105)
(name 'isConstructor')
(class (ref: 104))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 106)
(name 'kind')
(class (ref: 104))
(container false)
(derived false)
(multivalued false)
(type (ref: String)))
(FM3.Property (id: 107)
(name 'isConstant')
(class (ref: 104))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 108)
(name 'isSetter')
(class (ref: 104))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 109)
(name 'isGetter')
(class (ref: 104))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))))
(FM3.Trait (id: 110)
(name 'TFileSystemEntity')
(package (ref: 29))
(properties
(FM3.Property (id: 111)
(name 'numberOfLinesOfText')
(class (ref: 110))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 112)
(name 'parentFolder')
(class (ref: 110))
(container true)
(derived false)
(multivalued false)
(opposite (ref: 113))
(type (ref: 114)))))
(FM3.Trait (id: 115)
(name 'TCanBeClassSide')
(package (ref: 29))
(properties
(FM3.Property (id: 116)
(name 'isClassSide')
(class (ref: 115))
(container false)
(defaultValue (ref: 117))
(derived false)
(multivalued false)
(type (ref: Boolean)))))
(FM3.Trait (id: 118)
(name 'TEnum')
(package (ref: 29))
(traits (ref: 119) (ref: 46) (ref: 120) (ref: 47) (ref: 48) (ref: 121)))
(FM3.Trait (id: 122)
(name 'TWithStatements')
(package (ref: 29))
(traits (ref: 47) (ref: 81) (ref: 123) (ref: 124))
(properties
(FM3.Property (id: 125)
(name 'numberOfStatements')
(class (ref: 122))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Class (id: 126)
(name 'TypeGroup')
(abstract false)
(package (ref: 29))
(superclass (ref: 127))
(properties
(FM3.Property (id: 128)
(name 'averageNumberOfAttributes')
(class (ref: 126))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 129)
(name 'averageNumberOfMethods')
(class (ref: 126))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 130)
(name 'instability')
(class (ref: 126))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 131)
(name 'abstractness')
(class (ref: 126))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 132)
(name 'averageNumberOfStatements')
(class (ref: 126))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 133)
(name 'efferentCoupling')
(class (ref: 126))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 134)
(name 'afferentCoupling')
(class (ref: 126))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 135)
(name 'averageNumberOfMethods')
(class (ref: 126))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 136)
(name 'distance')
(class (ref: 126))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 137)
(name 'bunchCohesion')
(class (ref: 126))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 138)
(name 'TInvocation')
(package (ref: 29))
(traits (ref: 47) (ref: 76) (ref: 77))
(properties
(FM3.Property (id: 139)
(name 'sender')
(class (ref: 138))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 140))
(type (ref: 124)))
(FM3.Property (id: 141)
(name 'candidates')
(class (ref: 138))
(container false)
(derived false)
(multivalued true)
(opposite (ref: 142))
(type (ref: 143)))
(FM3.Property (id: 144)
(name 'receiver')
(class (ref: 138))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 145))
(type (ref: 146)))))
(FM3.Trait (id: 143)
(name 'TInvocable')
(package (ref: 29))
(properties
(FM3.Property (id: 142)
(name 'incomingInvocations')
(class (ref: 143))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 141))
(type (ref: 138)))))
(FM3.Trait (id: 103)
(name 'THeader')
(package (ref: 29))
(traits (ref: 99) (ref: 110))
(properties
(FM3.Property (id: 102)
(name 'headerOwner')
(class (ref: 103))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 101))
(type (ref: 100)))))
(FM3.Trait (id: 147)
(name 'TWithTemplates')
(package (ref: 29))
(properties
(FM3.Property (id: 148)
(name 'templates')
(class (ref: 147))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 149))
(type (ref: 150)))))
(FM3.Trait (id: 124)
(name 'TWithInvocations')
(package (ref: 29))
(properties
(FM3.Property (id: 140)
(name 'outgoingInvocations')
(class (ref: 124))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 139))
(type (ref: 138)))
(FM3.Property (id: 151)
(name 'numberOfOutgoingInvocations')
(class (ref: 124))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 152)
(name 'TWithMethods')
(package (ref: 29))
(properties
(FM3.Property (id: 153)
(name 'weightedMethodCount')
(class (ref: 152))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 154)
(name 'methods')
(class (ref: 152))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 155))
(type (ref: 156)))
(FM3.Property (id: 157)
(name 'numberOfMessageSends')
(class (ref: 152))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 158)
(name 'numberOfMethods')
(class (ref: 152))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 159)
(name 'tightClassCohesion')
(class (ref: 152))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 160)
(name 'numberOfAbstractMethods')
(class (ref: 152))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 161)
(name 'TImplicitVariable')
(package (ref: 29))
(traits (ref: 45) (ref: 46) (ref: 47) (ref: 48) (ref: 49) (ref: 50))
(properties
(FM3.Property (id: 162)
(name 'parentBehaviouralEntity')
(class (ref: 161))
(container true)
(derived false)
(multivalued false)
(opposite (ref: 163))
(type (ref: 164)))))
(FM3.Trait (id: 165)
(name 'TWithParameterizedTypes')
(package (ref: 29))
(properties
(FM3.Property (id: 166)
(name 'parameterizedTypes')
(class (ref: 165))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 167))
(type (ref: 168)))))
(FM3.Trait (id: 49)
(name 'TStructuralEntity')
(package (ref: 29))
(traits (ref: 45) (ref: 46) (ref: 47) (ref: 48) (ref: 50)))
(FM3.Trait (id: 169)
(name 'TAnnotationInstance')
(package (ref: 29))
(traits (ref: 48))
(properties
(FM3.Property (id: 170)
(name 'annotatedEntity')
(class (ref: 169))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 171))
(type (ref: 172)))))
(FM3.Trait (id: 46)
(name 'TNamedEntity')
(package (ref: 29))
(properties
(FM3.Property (id: 173)
(name 'name')
(class (ref: 46))
(container false)
(derived false)
(multivalued false)
(type (ref: String)))))
(FM3.Trait (id: 174)
(name 'TPackageable')
(package (ref: 29))
(properties
(FM3.Property (id: 175)
(name 'parentPackage')
(class (ref: 174))
(container true)
(derived false)
(multivalued false)
(opposite (ref: 176))
(type (ref: 177)))))
(FM3.Trait (id: 178)
(name 'TTypedAnnotationInstance')
(package (ref: 29))
(properties
(FM3.Property (id: 179)
(name 'annotationType')
(class (ref: 178))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 180))
(type (ref: 181)))))
(FM3.Trait (id: 182)
(name 'TWithAnnotationTypes')
(package (ref: 29))
(properties
(FM3.Property (id: 183)
(name 'definedAnnotationTypes')
(class (ref: 182))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 184))
(type (ref: 181)))))
(FM3.Trait (id: 185)
(name 'TWithSourceLanguages')
(package (ref: 29))
(properties
(FM3.Property (id: 186)
(name 'declaredSourceLanguage')
(class (ref: 185))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 187))
(type (ref: 188)))))
(FM3.Trait (id: 189)
(name 'TWithLocalVariables')
(package (ref: 29))
(properties
(FM3.Property (id: 190)
(name 'localVariables')
(class (ref: 189))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 191))
(type (ref: 192)))))
(FM3.Trait (id: 193)
(name 'TWithThrownExceptions')
(package (ref: 29))
(properties
(FM3.Property (id: 194)
(name 'thrownExceptions')
(class (ref: 193))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 195))
(type (ref: 196)))))
(FM3.Trait (id: 197)
(name 'TModule')
(package (ref: 29))
(properties
(FM3.Property (id: 198)
(name 'moduleEntities')
(class (ref: 197))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 199))
(type (ref: 200)))))
(FM3.Class (id: 201)
(name 'GlobalVariableGroup')
(abstract false)
(package (ref: 29))
(superclass (ref: 127)))
(FM3.Trait (id: 47)
(name 'TSourceEntity')
(package (ref: 29))
(properties
(FM3.Property (id: 202)
(name 'duplicationRate')
(class (ref: 47))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 203)
(name 'replicas')
(class (ref: 47))
(container false)
(derived true)
(multivalued false)
(type (ref: 204)))
(FM3.Property (id: 205)
(name 'numberOfLinesOfCode')
(class (ref: 47))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 206)
(name 'sourceAnchor')
(class (ref: 47))
(container false)
(derived true)
(multivalued false)
(opposite (ref: 207))
(type (ref: 27)))
(FM3.Property (id: 208)
(name 'sourceText')
(class (ref: 47))
(container false)
(derived true)
(multivalued false)
(type (ref: String)))
(FM3.Property (id: 209)
(name 'isStub')
(class (ref: 47))
(container false)
(derived false)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 210)
(name 'containsReplicas')
(class (ref: 47))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 211)
(name 'numberOfLinesOfCodeWithMoreThanOneCharacter')
(class (ref: 47))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 33)
(name 'TParameterizedTypeUser')
(package (ref: 29))
(properties
(FM3.Property (id: 32)
(name 'argumentsInParameterizedTypes')
(class (ref: 33))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 31))
(type (ref: 30)))))
(FM3.Trait (id: 188)
(name 'TSourceLanguage')
(package (ref: 29))
(properties
(FM3.Property (id: 187)
(name 'sourcedEntities')
(class (ref: 188))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 186))
(type (ref: 185)))))
(FM3.Trait (id: 212)
(name 'TWithCaughtExceptions')
(package (ref: 29))
(properties
(FM3.Property (id: 213)
(name 'caughtExceptions')
(class (ref: 212))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 214))
(type (ref: 215)))))
(FM3.Trait (id: 216)
(name 'TCanBeFinal')
(package (ref: 29))
(properties
(FM3.Property (id: 217)
(name 'isFinal')
(class (ref: 216))
(container false)
(derived false)
(multivalued false)
(type (ref: Boolean)))))
(FM3.Trait (id: 218)
(name 'TWithComments')
(package (ref: 29))
(properties
(FM3.Property (id: 219)
(name 'numberOfComments')
(class (ref: 218))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 220)
(name 'hasComments')
(class (ref: 218))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 221)
(name 'comments')
(class (ref: 218))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 222))
(type (ref: 223)))))
(FM3.Trait (id: 224)
(name 'TEnumValue')
(package (ref: 29))
(properties
(FM3.Property (id: 225)
(name 'parentEnum')
(class (ref: 224))
(container true)
(derived false)
(multivalued false)
(opposite (ref: 226))
(type (ref: 121)))))
(FM3.Trait (id: 77)
(name 'TAssociation')
(package (ref: 29))
(traits (ref: 47) (ref: 76))
(properties
(FM3.Property (id: 227)
(name 'previous')
(class (ref: 77))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 228))
(type (ref: 77)))
(FM3.Property (id: 228)
(name 'next')
(class (ref: 77))
(container false)
(derived true)
(multivalued false)
(opposite (ref: 227))
(type (ref: 77)))))
(FM3.Trait (id: 229)
(name 'TFileNavigation')
(package (ref: 29))
(traits (ref: 56))
(properties
(FM3.Property (id: 230)
(name 'endLine')
(class (ref: 229))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 231)
(name 'startColumn')
(class (ref: 229))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 232)
(name 'endColumn')
(class (ref: 229))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 233)
(name 'startLine')
(class (ref: 229))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 234)
(name 'TReference')
(package (ref: 29))
(traits (ref: 47) (ref: 76) (ref: 77))
(properties
(FM3.Property (id: 235)
(name 'referredType')
(class (ref: 234))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 236))
(type (ref: 120)))
(FM3.Property (id: 237)
(name 'referencer')
(class (ref: 234))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 238))
(type (ref: 123)))))
(FM3.Trait (id: 239)
(name 'TCanImplement')
(package (ref: 29))
(properties
(FM3.Property (id: 240)
(name 'interfaceImplementations')
(class (ref: 239))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 241))
(type (ref: 242)))))
(FM3.Trait (id: 50)
(name 'TAccessible')
(package (ref: 29))
(properties
(FM3.Property (id: 83)
(name 'incomingAccesses')
(class (ref: 50))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 82))
(type (ref: 75)))
(FM3.Property (id: 243)
(name 'numberOfAccessingMethods')
(class (ref: 50))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 244)
(name 'numberOfGlobalAccesses')
(class (ref: 50))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 245)
(name 'accessors')
(class (ref: 50))
(container false)
(derived true)
(multivalued true)
(type (ref: 81)))
(FM3.Property (id: 246)
(name 'numberOfAccessingClasses')
(class (ref: 50))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 247)
(name 'numberOfLocalAccesses')
(class (ref: 50))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 248)
(name 'numberOfAccesses')
(class (ref: 50))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 249)
(name 'TCompilationUnit')
(package (ref: 29))
(traits (ref: 99) (ref: 110))
(properties
(FM3.Property (id: 250)
(name 'compilationUnitOwner')
(class (ref: 249))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 251))
(type (ref: 252)))))
(FM3.Trait (id: 181)
(name 'TAnnotationType')
(package (ref: 29))
(properties
(FM3.Property (id: 180)
(name 'instances')
(class (ref: 181))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 179))
(type (ref: 178)))
(FM3.Property (id: 184)
(name 'annotationTypesContainer')
(class (ref: 181))
(container true)
(derived false)
(multivalued false)
(opposite (ref: 183))
(type (ref: 182)))))
(FM3.Trait (id: 253)
(name 'TWithAnnotationInstanceAttributes')
(package (ref: 29))
(properties
(FM3.Property (id: 254)
(name 'attributes')
(class (ref: 253))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 255))
(type (ref: 256)))))
(FM3.Trait (id: 74)
(name 'TWithTraits')
(package (ref: 29))
(properties
(FM3.Property (id: 73)
(name 'traits')
(class (ref: 74))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 72))
(type (ref: 68)))))
(FM3.Trait (id: 257)
(name 'TWithFunctions')
(package (ref: 29))
(properties
(FM3.Property (id: 258)
(name 'functions')
(class (ref: 257))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 259))
(type (ref: 260)))))
(FM3.Trait (id: 261)
(name 'THasModifiers')
(package (ref: 29))
(properties
(FM3.Property (id: 262)
(name 'modifiers')
(class (ref: 261))
(container false)
(derived false)
(multivalued true)
(type (ref: String)))
(FM3.Property (id: 263)
(name 'isFinal')
(class (ref: 261))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 264)
(name 'isAbstract')
(class (ref: 261))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))))
(FM3.Trait (id: 265)
(name 'TWithAttributes')
(package (ref: 29))
(properties
(FM3.Property (id: 266)
(name 'numberOfAttributes')
(class (ref: 265))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 267)
(name 'attributes')
(class (ref: 265))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 268))
(type (ref: 269)))))
(FM3.Trait (id: 270)
(name 'TWithClasses')
(package (ref: 29))
(traits (ref: 271))
(properties
(FM3.Property (id: 272)
(name 'numberOfClasses')
(class (ref: 270))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 260)
(name 'TFunction')
(package (ref: 29))
(traits (ref: 46) (ref: 81) (ref: 47) (ref: 45) (ref: 123) (ref: 273) (ref: 122) (ref: 274) (ref: 48) (ref: 124))
(properties
(FM3.Property (id: 259)
(name 'functionOwner')
(class (ref: 260))
(container true)
(derived false)
(multivalued false)
(opposite (ref: 258))
(type (ref: 257)))))
(FM3.Trait (id: 275)
(name 'TClassMetrics')
(package (ref: 29))
(properties
(FM3.Property (id: 276)
(name 'numberOfLocallyDefinedMethods')
(class (ref: 275))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 277)
(name 'numberOfMethodsInherited')
(class (ref: 275))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 278)
(name 'numberOfMethodsOverriden')
(class (ref: 275))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 279)
(name 'numberOfMethodsInHierarchy')
(class (ref: 275))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 280)
(name 'totalNumberOfSubclasses')
(class (ref: 275))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 281)
(name 'numberOfAttributesInherited')
(class (ref: 275))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 282)
(name 'TTemplateUser')
(package (ref: 29))
(properties
(FM3.Property (id: 283)
(name 'template')
(class (ref: 282))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 284))
(type (ref: 150)))))
(FM3.Trait (id: 271)
(name 'TWithTypes')
(package (ref: 29))
(properties
(FM3.Property (id: 285)
(name 'types')
(class (ref: 271))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 286))
(type (ref: 119)))))
(FM3.Trait (id: 287)
(name 'TLCOMMetrics')
(package (ref: 29))
(properties
(FM3.Property (id: 288)
(name 'lcom3')
(class (ref: 287))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 289)
(name 'lcom2')
(class (ref: 287))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 274)
(name 'TWithParameters')
(package (ref: 29))
(properties
(FM3.Property (id: 290)
(name 'numberOfParameters')
(class (ref: 274))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 291)
(name 'parameters')
(class (ref: 274))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 292))
(type (ref: 293)))))
(FM3.Trait (id: 294)
(name 'THasImmediateSource')
(package (ref: 29))
(traits (ref: 27))
(properties
(FM3.Property (id: 295)
(name 'source')
(class (ref: 294))
(container false)
(derived false)
(multivalued false)
(type (ref: String)))))
(FM3.Trait (id: 71)
(name 'TTraitUsage')
(package (ref: 29))
(traits (ref: 47) (ref: 76) (ref: 77))
(properties
(FM3.Property (id: 70)
(name 'trait')
(class (ref: 71))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 69))
(type (ref: 68)))
(FM3.Property (id: 296)
(name 'user')
(class (ref: 71))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 297))
(type (ref: 298)))))
(FM3.Trait (id: 45)
(name 'TTypedEntity')
(package (ref: 29))
(properties
(FM3.Property (id: 299)
(name 'declaredType')
(class (ref: 45))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 300))
(type (ref: 119)))))
(FM3.Class (id: 301)
(name 'ClassGroup')
(abstract false)
(package (ref: 29))
(superclass (ref: 126)))
(FM3.Trait (id: 177)
(name 'TPackage')
(package (ref: 29))
(traits (ref: 47) (ref: 46) (ref: 48))
(properties
(FM3.Property (id: 302)
(name 'weightedMethodCount')
(class (ref: 177))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 176)
(name 'childEntities')
(class (ref: 177))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 175))
(type (ref: 174)))))
(FM3.Trait (id: 256)
(name 'TAnnotationInstanceAttribute')
(package (ref: 29))
(traits (ref: 48))
(properties
(FM3.Property (id: 255)
(name 'parentAnnotationInstance')
(class (ref: 256))
(container true)
(derived false)
(multivalued false)
(opposite (ref: 254))
(type (ref: 253)))
(FM3.Property (id: 303)
(name 'value')
(class (ref: 256))
(container false)
(derived false)
(multivalued false)
(type (ref: String)))))
(FM3.Trait (id: 304)
(name 'TWithDeclaredExceptions')
(package (ref: 29))
(properties
(FM3.Property (id: 305)
(name 'declaredExceptions')
(class (ref: 304))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 306))
(type (ref: 307)))))
(FM3.Trait (id: 95)
(name 'TDereferencedInvocation')
(package (ref: 29))
(traits (ref: 47) (ref: 76) (ref: 138) (ref: 77))
(properties
(FM3.Property (id: 94)
(name 'referencer')
(class (ref: 95))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 93))
(type (ref: 92)))))
(FM3.Trait (id: 121)
(name 'TWithEnumValues')
(package (ref: 29))
(properties
(FM3.Property (id: 226)
(name 'enumValues')
(class (ref: 121))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 225))
(type (ref: 224)))))
(FM3.Trait (id: 215)
(name 'TCaughtException')
(package (ref: 29))
(properties
(FM3.Property (id: 214)
(name 'definingEntity')
(class (ref: 215))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 213))
(type (ref: 212)))))
(FM3.Trait (id: 164)
(name 'TWithImplicitVariables')
(package (ref: 29))
(properties
(FM3.Property (id: 163)
(name 'implicitVariables')
(class (ref: 164))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 162))
(type (ref: 161)))))
(FM3.Trait (id: 37)
(name 'TInheritance')
(package (ref: 29))
(traits (ref: 47) (ref: 76) (ref: 77))
(properties
(FM3.Property (id: 36)
(name 'subclass')
(class (ref: 37))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 35))
(type (ref: 34)))
(FM3.Property (id: 40)
(name 'superclass')
(class (ref: 37))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 39))
(type (ref: 34)))))
(FM3.Trait (id: 308)
(name 'TException')
(package (ref: 29))
(properties
(FM3.Property (id: 309)
(name 'exceptionClass')
(class (ref: 308))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 310))
(type (ref: 311)))))
(FM3.Trait (id: 120)
(name 'TReferenceable')
(package (ref: 29))
(properties
(FM3.Property (id: 236)
(name 'incomingReferences')
(class (ref: 120))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 235))
(type (ref: 234)))))
(FM3.Class (id: 312)
(name 'FolderGroup')
(abstract false)
(package (ref: 29))
(superclass (ref: 127)))
(FM3.Trait (id: 313)
(name 'TPreprocessorIfdef')
(package (ref: 29)))
(FM3.Class (id: 314)
(name 'AnnotationTypeGroup')
(abstract false)
(package (ref: 29))
(superclass (ref: 127)))
(FM3.Trait (id: 315)
(name 'TCanBeAbstract')
(package (ref: 29))
(properties
(FM3.Property (id: 316)
(name 'isAbstract')
(class (ref: 315))
(container false)
(derived false)
(multivalued false)
(type (ref: Boolean)))))
(FM3.Trait (id: 99)
(name 'TFile')
(package (ref: 29))
(traits (ref: 110))
(properties
(FM3.Property (id: 317)
(name 'numberOfEmptyLinesOfText')
(class (ref: 99))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 98)
(name 'entities')
(class (ref: 99))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 97))
(type (ref: 96)))
(FM3.Property (id: 318)
(name 'numberOfKiloBytes')
(class (ref: 99))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 319)
(name 'numberOfCharacters')
(class (ref: 99))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 320)
(name 'totalNumberOfLinesOfText')
(class (ref: 99))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 321)
(name 'averageNumberOfCharactersPerLine')
(class (ref: 99))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 322)
(name 'numberOfBytes')
(class (ref: 99))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 323)
(name 'TCohesionCouplingMetrics')
(package (ref: 29))
(traits (ref: 47) (ref: 177) (ref: 46) (ref: 48))
(properties
(FM3.Property (id: 324)
(name 'martinCohesion')
(class (ref: 323))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 325)
(name 'abstractness')
(class (ref: 323))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 326)
(name 'instability')
(class (ref: 323))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 327)
(name 'efferentCoupling')
(class (ref: 323))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 328)
(name 'afferentCoupling')
(class (ref: 323))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 329)
(name 'distance')
(class (ref: 323))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 269)
(name 'TAttribute')
(package (ref: 29))
(traits (ref: 45) (ref: 46) (ref: 47) (ref: 48) (ref: 49) (ref: 50))
(properties
(FM3.Property (id: 268)
(name 'parentType')
(class (ref: 269))
(container true)
(derived false)
(multivalued false)
(opposite (ref: 267))
(type (ref: 265)))
(FM3.Property (id: 330)
(name 'hierarchyNestingLevel')
(class (ref: 269))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 331)
(name 'hasClassScope')
(class (ref: 269))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))))
(FM3.Class (id: 332)
(name 'NamespaceGroup')
(abstract false)
(package (ref: 29))
(superclass (ref: 127)))
(FM3.Class (id: 333)
(name 'FamixModel')
(abstract false)
(package (ref: 29))
(superclass (ref: 334)))
(FM3.Class (id: 335)
(name 'AnnotationInstanceGroup')
(abstract false)
(package (ref: 29))
(superclass (ref: 127)))
(FM3.Trait (id: 81)
(name 'TWithAccesses')
(package (ref: 29))
(properties
(FM3.Property (id: 80)
(name 'accesses')
(class (ref: 81))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 79))
(type (ref: 75)))))
(FM3.Trait (id: 336)
(name 'TAnnotationTypeAttribute')
(package (ref: 29))
(traits (ref: 45) (ref: 46) (ref: 269) (ref: 47) (ref: 48) (ref: 49) (ref: 50))
(properties
(FM3.Property (id: 337)
(name 'annotationAttributeInstances')
(class (ref: 336))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 338))
(type (ref: 339)))))
(FM3.Trait (id: 252)
(name 'TWithCompilationUnits')
(package (ref: 29))
(properties
(FM3.Property (id: 251)
(name 'compilationUnit')
(class (ref: 252))
(container false)
(derived true)
(multivalued false)
(opposite (ref: 250))
(type (ref: 249)))))
(FM3.Trait (id: 340)
(name 'TImplementable')
(package (ref: 29))
(properties
(FM3.Property (id: 341)
(name 'implementations')
(class (ref: 340))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 342))
(type (ref: 242)))))
(FM3.Trait (id: 114)
(name 'TFolder')
(package (ref: 29))
(traits (ref: 110))
(properties
(FM3.Property (id: 343)
(name 'numberOfFolders')
(class (ref: 114))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 344)
(name 'numberOfFiles')
(class (ref: 114))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 345)
(name 'totalNumberOfLinesOfText')
(class (ref: 114))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 346)
(name 'numberOfEmptyLinesOfText')
(class (ref: 114))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 113)
(name 'childrenFileSystemEntities')
(class (ref: 114))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 112))
(type (ref: 110)))))
(FM3.Trait (id: 347)
(name 'TUnknownSourceLanguage')
(package (ref: 29))
(traits (ref: 188)))
(FM3.Trait (id: 273)
(name 'THasSignature')
(package (ref: 29))
(properties
(FM3.Property (id: 348)
(name 'signature')
(class (ref: 273))
(container false)
(derived false)
(multivalued false)
(type (ref: String)))))
(FM3.Trait (id: 168)
(name 'TParameterizedType')
(package (ref: 29))
(properties
(FM3.Property (id: 167)
(name 'parameterizableClass')
(class (ref: 168))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 166))
(type (ref: 165)))))
(FM3.Trait (id: 223)
(name 'TComment')
(package (ref: 29))
(properties
(FM3.Property (id: 222)
(name 'container')
(class (ref: 223))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 221))
(type (ref: 218)))
(FM3.Property (id: 349)
(name 'content')
(class (ref: 223))
(container false)
(derived false)
(multivalued false)
(type (ref: String)))))
(FM3.Trait (id: 192)
(name 'TLocalVariable')
(package (ref: 29))
(traits (ref: 45) (ref: 46) (ref: 47) (ref: 48) (ref: 49) (ref: 50))
(properties
(FM3.Property (id: 191)
(name 'parentBehaviouralEntity')
(class (ref: 192))
(container true)
(derived false)
(multivalued false)
(opposite (ref: 190))
(type (ref: 189)))))
(FM3.Trait (id: 298)
(name 'TTraitUser')
(package (ref: 29))
(properties
(FM3.Property (id: 297)
(name 'outgoingTraitUsages')
(class (ref: 298))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 296))
(type (ref: 71)))))
(FM3.Trait (id: 53)
(name 'TWithGlobalVariables')
(package (ref: 29))
(properties
(FM3.Property (id: 52)
(name 'globalVariables')
(class (ref: 53))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 51))
(type (ref: 44)))))
(FM3.Trait (id: 350)
(name 'TWithPackages')
(package (ref: 29)))
(FM3.Trait (id: 351)
(name 'THasVisibility')
(package (ref: 29))
(properties
(FM3.Property (id: 352)
(name 'visibility')
(class (ref: 351))
(container false)
(derived false)
(multivalued false)
(type (ref: String)))
(FM3.Property (id: 353)
(name 'isProtected')
(class (ref: 351))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 354)
(name 'isPackage')
(class (ref: 351))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 355)
(name 'isPublic')
(class (ref: 351))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 356)
(name 'isPrivate')
(class (ref: 351))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))))
(FM3.Trait (id: 200)
(name 'TDefinedInModule')
(package (ref: 29))
(properties
(FM3.Property (id: 199)
(name 'parentModule')
(class (ref: 200))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 198))
(type (ref: 197)))))
(FM3.Trait (id: 357)
(name 'TUnknownVariable')
(package (ref: 29))
(traits (ref: 45) (ref: 46) (ref: 47) (ref: 48) (ref: 49) (ref: 50)))
(FM3.Trait (id: 358)
(name 'TParameterType')
(package (ref: 29)))
(FM3.Trait (id: 56)
(name 'TFileAnchor')
(package (ref: 29))
(properties
(FM3.Property (id: 359)
(name 'correspondingFile')
(class (ref: 56))
(container false)
(derived false)
(multivalued false)
(type (ref: 99)))
(FM3.Property (id: 360)
(name 'encoding')
(class (ref: 56))
(container false)
(derived false)
(multivalued false)
(type (ref: String)))
(FM3.Property (id: 361)
(name 'fileName')
(class (ref: 56))
(container false)
(derived false)
(multivalued false)
(type (ref: String)))))
(FM3.Trait (id: 242)
(name 'TImplementation')
(package (ref: 29))
(traits (ref: 47) (ref: 76) (ref: 77))
(properties
(FM3.Property (id: 241)
(name 'implementingClass')
(class (ref: 242))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 240))
(type (ref: 239)))
(FM3.Property (id: 342)
(name 'interface')
(class (ref: 242))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 341))
(type (ref: 340)))))
(FM3.Trait (id: 172)
(name 'TWithAnnotationInstances')
(package (ref: 29))
(properties
(FM3.Property (id: 362)
(name 'numberOfAnnotationInstances')
(class (ref: 172))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 171)
(name 'annotationInstances')
(class (ref: 172))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 170))
(type (ref: 169)))))
(FM3.Trait (id: 150)
(name 'TTemplate')
(package (ref: 29))
(properties
(FM3.Property (id: 149)
(name 'templateOwner')
(class (ref: 150))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 148))
(type (ref: 147)))
(FM3.Property (id: 284)
(name 'templateUsers')
(class (ref: 150))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 283))
(type (ref: 282)))))
(FM3.Class (id: 363)
(name 'InvocationGroup')
(abstract false)
(package (ref: 29))
(superclass (ref: 127)))
(FM3.Trait (id: 123)
(name 'TWithReferences')
(package (ref: 29))
(properties
(FM3.Property (id: 238)
(name 'outgoingReferences')
(class (ref: 123))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 237))
(type (ref: 234)))))
(FM3.Trait (id: 293)
(name 'TParameter')
(package (ref: 29))
(traits (ref: 45) (ref: 46) (ref: 47) (ref: 48) (ref: 49) (ref: 50))
(properties
(FM3.Property (id: 292)
(name 'parentBehaviouralEntity')
(class (ref: 293))
(container true)
(derived false)
(multivalued false)
(opposite (ref: 291))
(type (ref: 274)))))
(FM3.Trait (id: 60)
(name 'TWithTypeAliases')
(package (ref: 29))
(properties
(FM3.Property (id: 59)
(name 'typeAliases')
(class (ref: 60))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 58))
(type (ref: 57)))))
(FM3.Trait (id: 307)
(name 'TDeclaredException')
(package (ref: 29))
(properties
(FM3.Property (id: 306)
(name 'definingEntity')
(class (ref: 307))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 305))
(type (ref: 304)))))
(FM3.Trait (id: 311)
(name 'TWithExceptions')
(package (ref: 29))
(properties
(FM3.Property (id: 310)
(name 'exceptions')
(class (ref: 311))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 309))
(type (ref: 308)))))
(FM3.Trait (id: 156)
(name 'TMethod')
(package (ref: 29))
(traits (ref: 189) (ref: 46) (ref: 81) (ref: 364) (ref: 45) (ref: 123) (ref: 47) (ref: 122) (ref: 273) (ref: 164) (ref: 365) (ref: 274) (ref: 143) (ref: 48) (ref: 124))
(properties
(FM3.Property (id: 155)
(name 'parentType')
(class (ref: 156))
(container true)
(derived false)
(multivalued false)
(opposite (ref: 154))
(type (ref: 152)))
(FM3.Property (id: 366)
(name 'hasClassScope')
(class (ref: 156))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 367)
(name 'numberOfMessageSends')
(class (ref: 156))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 368)
(name 'TClassWithVisibility')
(package (ref: 29))
(traits (ref: 152) (ref: 265) (ref: 146) (ref: 46) (ref: 174) (ref: 119) (ref: 34) (ref: 47) (ref: 364) (ref: 369) (ref: 351) (ref: 120) (ref: 218) (ref: 48)))
(FM3.Trait (id: 339)
(name 'TTypedAnnotationInstanceAttribute')
(package (ref: 29))
(properties
(FM3.Property (id: 338)
(name 'annotationTypeAttribute')
(class (ref: 339))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 337))
(type (ref: 336)))))
(FM3.Trait (id: 196)
(name 'TThrownException')
(package (ref: 29))
(properties
(FM3.Property (id: 195)
(name 'definingEntity')
(class (ref: 196))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 194))
(type (ref: 193)))))
(FM3.Trait (id: 146)
(name 'TInvocationsReceiver')
(package (ref: 29))
(properties
(FM3.Property (id: 145)
(name 'receivingInvocations')
(class (ref: 146))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 144))
(type (ref: 138)))))
(FM3.Trait (id: 365)
(name 'TMethodMetrics')
(package (ref: 29))
(properties
(FM3.Property (id: 370)
(name 'numberOfAnnotationInstances')
(class (ref: 365))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 371)
(name 'hierarchyNestingLevel')
(class (ref: 365))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 372)
(name 'cyclomaticComplexity')
(class (ref: 365))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 373)
(name 'TPrimitiveType')
(package (ref: 29))
(traits (ref: 119) (ref: 46) (ref: 120) (ref: 47) (ref: 48)))
(FM3.Trait (id: 119)
(name 'TType')
(package (ref: 29))
(traits (ref: 47) (ref: 120) (ref: 46) (ref: 48))
(properties
(FM3.Property (id: 300)
(name 'typedEntities')
(class (ref: 119))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 299))
(type (ref: 45)))
(FM3.Property (id: 286)
(name 'typeContainer')
(class (ref: 119))
(container true)
(derived false)
(multivalued false)
(opposite (ref: 285))
(type (ref: 271)))))
(FM3.Class (id: 374)
(name 'FileGroup')
(abstract false)
(package (ref: 29))
(superclass (ref: 127)))
(FM3.Trait (id: 27)
(name 'TSourceAnchor')
(package (ref: 29))
(properties
(FM3.Property (id: 207)
(name 'element')
(class (ref: 27))
(container false)
(derived false)
(multivalued false)
(opposite (ref: 206))
(type (ref: 47)))
(FM3.Property (id: 375)
(name 'lineCount')
(class (ref: 27))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Class (id: 376)
(name 'PackageGroup')
(abstract false)
(package (ref: 29))
(superclass (ref: 127)))
(FM3.Trait (id: 89)
(name 'TWithFileIncludes')
(package (ref: 29))
(properties
(FM3.Property (id: 91)
(name 'incomingIncludeRelations')
(class (ref: 89))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 90))
(type (ref: 86)))
(FM3.Property (id: 88)
(name 'outgoingIncludeRelations')
(class (ref: 89))
(container false)
(derived true)
(multivalued true)
(opposite (ref: 87))
(type (ref: 86)))))
(FM3.Trait (id: 377)
(name 'TNamespace')
(package (ref: 29))
(traits (ref: 47) (ref: 364) (ref: 46) (ref: 48)))
(FM3.Trait (id: 378)
(name 'TClassHierarchyNavigation')
(package (ref: 29)))
(FM3.Trait (id: 369)
(name 'TClass')
(package (ref: 29))
(traits (ref: 152) (ref: 265) (ref: 146) (ref: 46) (ref: 174) (ref: 119) (ref: 34) (ref: 47) (ref: 364) (ref: 120) (ref: 218) (ref: 48))
(properties
(FM3.Property (id: 379)
(name 'isTestCase')
(class (ref: 369))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 380)
(name 'weightOfAClass')
(class (ref: 369))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 381)
(name 'TPreprocessorDefine')
(package (ref: 29)))
(FM3.Class (id: 382)
(name 'MethodGroup')
(abstract false)
(package (ref: 29))
(superclass (ref: 127))
(properties
(FM3.Property (id: 383)
(name 'averageNumberOfLinesOfCode')
(class (ref: 382))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 384)
(name 'averageNumberOfParameters')
(class (ref: 382))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 385)
(name 'averageNumberOfInvocations')
(class (ref: 382))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))))))
(FM3.Package (id: 386)
(name 'Famix-Java-Entities')
(classes
(FM3.Class (id: 387)
(name 'Class')
(abstract false)
(package (ref: 386))
(superclass (ref: 388))
(traits (ref: 218) (ref: 34) (ref: 152) (ref: 46) (ref: 311) (ref: 275) (ref: 351) (ref: 115) (ref: 146) (ref: 287) (ref: 174) (ref: 48) (ref: 239) (ref: 120) (ref: 119) (ref: 369) (ref: 389) (ref: 265) (ref: 47) (ref: 216) (ref: 315) (ref: 364))
(properties
(FM3.Property (id: 390)
(name 'isInterface')
(class (ref: 387))
(container false)
(derived false)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 391)
(name 'isIgnored')
(class (ref: 387))
(container false)
(derived true)
(multivalued true)
(type (ref: Boolean)))))
(FM3.Class (id: 392)
(name 'Inheritance')
(abstract false)
(package (ref: 386))
(superclass (ref: 393))
(traits (ref: 47) (ref: 76) (ref: 37) (ref: 77)))
(FM3.Class (id: 394)
(name 'Exception')
(abstract false)
(package (ref: 386))
(superclass (ref: 393))
(traits (ref: 308)))
(FM3.Trait (id: 395)
(name 'TCanBeSynchronized')
(package (ref: 386))
(properties
(FM3.Property (id: 396)
(name 'isSynchronized')
(class (ref: 395))
(container false)
(derived false)
(multivalued false)
(type (ref: Boolean)))))
(FM3.Class (id: 397)
(name 'Interface')
(abstract false)
(package (ref: 386))
(superclass (ref: 388))
(traits (ref: 152) (ref: 265) (ref: 146) (ref: 340) (ref: 174) (ref: 34) (ref: 351) (ref: 364) (ref: 218) (ref: 115) (ref: 48) (ref: 216)))
(FM3.Class (id: 398)
(name 'GlobalVariable')
(abstract false)
(package (ref: 386))
(superclass (ref: 399))
(traits (ref: 44) (ref: 45) (ref: 46) (ref: 47) (ref: 48) (ref: 146) (ref: 49) (ref: 50)))
(FM3.Class (id: 400)
(name 'FamixJavaModel')
(abstract false)
(package (ref: 386))
(superclass (ref: 334)))
(FM3.Class (id: 401)
(name 'ParameterType')
(abstract false)
(package (ref: 386))
(superclass (ref: 388))
(traits (ref: 358)))
(FM3.Class (id: 402)
(name 'ParameterizableClass')
(abstract false)
(package (ref: 386))
(superclass (ref: 387))
(traits (ref: 165))
(properties
(FM3.Property (id: 403)
(name 'parameters')
(class (ref: 402))
(container false)
(derived true)
(multivalued true)
(type (ref: 401)))))
(FM3.Trait (id: 404)
(name 'TCanBeTransient')
(package (ref: 386))
(properties
(FM3.Property (id: 405)
(name 'isTransient')
(class (ref: 404))
(container false)
(derived false)
(multivalued false)
(type (ref: Boolean)))))
(FM3.Class (id: 406)
(name 'LocalVariable')
(abstract false)
(package (ref: 386))
(superclass (ref: 399))
(traits (ref: 146) (ref: 192) (ref: 46) (ref: 47) (ref: 45) (ref: 218) (ref: 50) (ref: 49) (ref: 48) (ref: 216)))
(FM3.Class (id: 407)
(name 'PrimitiveType')
(abstract false)
(package (ref: 386))
(superclass (ref: 388))
(traits (ref: 373) (ref: 119) (ref: 46) (ref: 120) (ref: 47) (ref: 48)))
(FM3.Class (id: 408)
(name 'UnknownSourceLanguage')
(abstract false)
(package (ref: 386))
(superclass (ref: 409))
(traits (ref: 347) (ref: 188))
(properties
(FM3.Property (id: 410)
(name 'name')
(class (ref: 408))
(container false)
(derived true)
(multivalued false)
(type (ref: String)))))
(FM3.Class (id: 411)
(name 'DeclaredException')
(abstract false)
(package (ref: 386))
(superclass (ref: 394))
(traits (ref: 307)))
(FM3.Class (id: 412)
(name 'Parameter')
(abstract false)
(package (ref: 386))
(superclass (ref: 399))
(traits (ref: 49) (ref: 45) (ref: 46) (ref: 50) (ref: 293) (ref: 218) (ref: 48) (ref: 47) (ref: 216)))
(FM3.Class (id: 413)
(name 'Invocation')
(abstract false)
(package (ref: 386))
(superclass (ref: 393))
(traits (ref: 77) (ref: 76) (ref: 47) (ref: 138) (ref: 273)))
(FM3.Class (id: 414)
(name 'Package')
(abstract false)
(package (ref: 386))
(superclass (ref: 415))
(traits (ref: 174) (ref: 46) (ref: 177) (ref: 47) (ref: 48) (ref: 53))
(properties
(FM3.Property (id: 416)
(name 'abstractness')
(class (ref: 414))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 417)
(name 'bunchCohesion')
(class (ref: 414))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 418)
(name 'distance')
(class (ref: 414))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 419)
(name 'afferentCoupling')
(class (ref: 414))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 420)
(name 'efferentCoupling')
(class (ref: 414))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 421)
(name 'relativeImportanceForSystem')
(class (ref: 414))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 422)
(name 'instability')
(class (ref: 414))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 423)
(name 'martinCohesion')
(class (ref: 414))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 424)
(name 'numberOfClientPackages')
(class (ref: 414))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 425)
(name 'numberOfMethods')
(class (ref: 414))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Class (id: 426)
(name 'SourceAnchor')
(abstract false)
(package (ref: 386))
(superclass (ref: 393))
(traits (ref: 27)))
(FM3.Class (id: 427)
(name 'ParameterizedType')
(abstract false)
(package (ref: 386))
(superclass (ref: 388))
(traits (ref: 30) (ref: 34) (ref: 340) (ref: 239) (ref: 168)))
(FM3.Class (id: 393)
(name 'Entity')
(abstract false)
(package (ref: 386))
(superclass (ref: 3)))
(FM3.Class (id: 428)
(name 'Attribute')
(abstract false)
(package (ref: 386))
(superclass (ref: 399))
(traits (ref: 404) (ref: 146) (ref: 269) (ref: 46) (ref: 351) (ref: 45) (ref: 47) (ref: 218) (ref: 429) (ref: 50) (ref: 48) (ref: 115) (ref: 49) (ref: 216)))
(FM3.Class (id: 430)
(name 'SourceTextAnchor')
(abstract false)
(package (ref: 386))
(superclass (ref: 426))
(traits (ref: 294) (ref: 27)))
(FM3.Class (id: 388)
(name 'Type')
(abstract false)
(package (ref: 386))
(superclass (ref: 415))
(traits (ref: 119) (ref: 46) (ref: 60) (ref: 152) (ref: 120) (ref: 33) (ref: 47) (ref: 48))
(properties
(FM3.Property (id: 431)
(name 'isTestCase')
(class (ref: 388))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 432)
(name 'isJUnit4TestCase')
(class (ref: 388))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 433)
(name 'isInnerClass')
(class (ref: 388))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))))
(FM3.Class (id: 434)
(name 'EnumValue')
(abstract false)
(package (ref: 386))
(superclass (ref: 399))
(traits (ref: 224) (ref: 45) (ref: 46) (ref: 47) (ref: 48) (ref: 218) (ref: 49) (ref: 50)))
(FM3.Class (id: 435)
(name 'AnnotationInstanceAttribute')
(abstract false)
(package (ref: 386))
(superclass (ref: 436))
(traits (ref: 339) (ref: 256) (ref: 48)))
(FM3.Trait (id: 429)
(name 'TCanBeVolatile')
(package (ref: 386))
(properties
(FM3.Property (id: 437)
(name 'isVolatile')
(class (ref: 429))
(container false)
(derived false)
(multivalued false)
(type (ref: Boolean)))))
(FM3.Class (id: 399)
(name 'NamedEntity')
(abstract false)
(package (ref: 386))
(superclass (ref: 436))
(traits (ref: 48) (ref: 46) (ref: 146) (ref: 172)))
(FM3.Class (id: 438)
(name 'Comment')
(abstract false)
(package (ref: 386))
(superclass (ref: 436))
(traits (ref: 223)))
(FM3.Class (id: 439)
(name 'CaughtException')
(abstract false)
(package (ref: 386))
(superclass (ref: 394))
(traits (ref: 215)))
(FM3.Class (id: 440)
(name 'ParameterizableInterface')
(abstract false)
(package (ref: 386))
(superclass (ref: 397))
(traits (ref: 165)))
(FM3.Class (id: 441)
(name 'Folder')
(abstract false)
(package (ref: 386))
(superclass (ref: 399))
(traits (ref: 114) (ref: 110)))
(FM3.Class (id: 442)
(name 'ThrownException')
(abstract false)
(package (ref: 386))
(superclass (ref: 394))
(traits (ref: 196)))
(FM3.Trait (id: 443)
(name 'TWithInterfaces')
(package (ref: 386))
(traits (ref: 271)))
(FM3.Class (id: 444)
(name 'ImplicitVariable')
(abstract false)
(package (ref: 386))
(superclass (ref: 399))
(traits (ref: 161) (ref: 45) (ref: 46) (ref: 47) (ref: 48) (ref: 146) (ref: 49) (ref: 50)))
(FM3.Class (id: 436)
(name 'SourcedEntity')
(abstract false)
(package (ref: 386))
(superclass (ref: 393))
(traits (ref: 47) (ref: 96))
(properties
(FM3.Property (id: 445)
(name 'numberOfJavaNullChecks')
(class (ref: 436))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Class (id: 446)
(name 'Enum')
(abstract false)
(package (ref: 386))
(superclass (ref: 388))
(traits (ref: 152) (ref: 265) (ref: 46) (ref: 119) (ref: 34) (ref: 351) (ref: 47) (ref: 121) (ref: 118) (ref: 120) (ref: 218) (ref: 48)))
(FM3.Class (id: 409)
(name 'SourceLanguage')
(abstract false)
(package (ref: 386))
(superclass (ref: 393))
(traits (ref: 188))
(properties
(FM3.Property (id: 447)
(name 'name')
(class (ref: 409))
(container false)
(derived true)
(multivalued false)
(type (ref: String)))))
(FM3.Class (id: 448)
(name 'IndexedFileAnchor')
(abstract false)
(package (ref: 386))
(superclass (ref: 426))
(traits (ref: 56) (ref: 65)))
(FM3.Class (id: 449)
(name 'Method')
(abstract false)
(package (ref: 386))
(superclass (ref: 415))
(traits (ref: 189) (ref: 273) (ref: 218) (ref: 46) (ref: 104) (ref: 212) (ref: 274) (ref: 45) (ref: 351) (ref: 164) (ref: 115) (ref: 81) (ref: 156) (ref: 395) (ref: 123) (ref: 193) (ref: 365) (ref: 48) (ref: 143) (ref: 122) (ref: 47) (ref: 216) (ref: 124) (ref: 315) (ref: 304) (ref: 364))
(properties
(FM3.Property (id: 450)
(name 'isJUnit4Test')
(class (ref: 449))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 451)
(name 'isOverriding')
(class (ref: 449))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 452)
(name 'numberOfComments')
(class (ref: 449))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 453)
(name 'numberOfInvokedMethods')
(class (ref: 449))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 454)
(name 'invokedMethods')
(class (ref: 449))
(container false)
(derived true)
(multivalued true)
(type (ref: 449)))
(FM3.Property (id: 455)
(name 'isImplementing')
(class (ref: 449))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 456)
(name 'invokingMethods')
(class (ref: 449))
(container false)
(derived true)
(multivalued true)
(type (ref: 449)))
(FM3.Property (id: 457)
(name 'clientBehaviours')
(class (ref: 449))
(container false)
(derived true)
(multivalued true)
(type (ref: 449)))
(FM3.Property (id: 458)
(name 'numberOfConditionals')
(class (ref: 449))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 459)
(name 'isClassInitializer')
(class (ref: 449))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 460)
(name 'providerBehaviours')
(class (ref: 449))
(container false)
(derived true)
(multivalued true)
(type (ref: 449)))
(FM3.Property (id: 461)
(name 'isOverriden')
(class (ref: 449))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 462)
(name 'numberOfAccesses')
(class (ref: 449))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Class (id: 463)
(name 'AnnotationInstance')
(abstract false)
(package (ref: 386))
(superclass (ref: 436))
(traits (ref: 169) (ref: 178) (ref: 253) (ref: 48)))
(FM3.Class (id: 464)
(name 'AnnotationTypeAttribute')
(abstract false)
(package (ref: 386))
(superclass (ref: 399))
(traits (ref: 269) (ref: 46) (ref: 47) (ref: 45) (ref: 339) (ref: 218) (ref: 50) (ref: 48) (ref: 49) (ref: 336))
(properties
(FM3.Property (id: 465)
(name 'parentAnnotationType')
(class (ref: 464))
(container false)
(derived true)
(multivalued false)
(type (ref: 466)))))
(FM3.Class (id: 467)
(name 'File')
(abstract false)
(package (ref: 386))
(superclass (ref: 399))
(traits (ref: 99) (ref: 110)))
(FM3.Class (id: 466)
(name 'AnnotationType')
(abstract false)
(package (ref: 386))
(superclass (ref: 388))
(traits (ref: 174) (ref: 34) (ref: 340) (ref: 351) (ref: 265) (ref: 181) (ref: 218)))
(FM3.Trait (id: 389)
(name 'TClassMetrics')
(package (ref: 386))
(properties
(FM3.Property (id: 468)
(name 'numberOfProtectedMethods')
(class (ref: 389))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 469)
(name 'numberOfAccessorMethods')
(class (ref: 389))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 470)
(name 'numberOfPrivateMethods')
(class (ref: 389))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 471)
(name 'numberOfConstructorMethods')
(class (ref: 389))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 472)
(name 'numberOfPublicMethods')
(class (ref: 389))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Class (id: 473)
(name 'Access')
(abstract false)
(package (ref: 386))
(superclass (ref: 393))
(traits (ref: 47) (ref: 75) (ref: 76) (ref: 77)))
(FM3.Class (id: 415)
(name 'ContainerEntity')
(abstract false)
(package (ref: 386))
(superclass (ref: 399))
(traits (ref: 364) (ref: 270) (ref: 182) (ref: 48) (ref: 271) (ref: 443)))
(FM3.Class (id: 474)
(name 'Reference')
(abstract false)
(package (ref: 386))
(superclass (ref: 393))
(traits (ref: 47) (ref: 76) (ref: 234) (ref: 77)))
(FM3.Class (id: 475)
(name 'Implementation')
(abstract false)
(package (ref: 386))
(superclass (ref: 393))
(traits (ref: 47) (ref: 76) (ref: 242) (ref: 77)))
(FM3.Class (id: 476)
(name 'UnknownVariable')
(abstract false)
(package (ref: 386))
(superclass (ref: 399))
(traits (ref: 45) (ref: 357) (ref: 46) (ref: 47) (ref: 48) (ref: 146) (ref: 49) (ref: 50)))))
(FM3.Package (id: 477)
(name 'FamixReplication')
(classes
(FM3.Class (id: 204)
(name 'Replica')
(abstract false)
(package (ref: 477))
(superclass (ref: 3)))
(FM3.Class (id: 478)
(name 'ReplicatedFragment')
(abstract false)
(package (ref: 477))
(superclass (ref: 3)))))
(FM3.Package (id: 479)
(name 'Moose')
(classes
(FM3.Class (id: 480)
(name 'Group')
(abstract false)
(package (ref: 479))
(superclass (ref: 23)))
(FM3.Class (id: 127)
(name 'SpecializedGroup')
(abstract false)
(package (ref: 479))
(superclass (ref: 480)))
(FM3.Class (id: 334)
(name 'Model')
(abstract false)
(package (ref: 479))
(superclass (ref: 23))
(properties
(FM3.Property (id: 481)
(name 'numberOfMethods')
(class (ref: 334))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 482)
(name 'numberOfLinesOfCode')
(class (ref: 334))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 483)
(name 'numberOfClassesPerPackage')
(class (ref: 334))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 484)
(name 'numberOfLinesOfCodePerClass')
(class (ref: 334))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 485)
(name 'numberOfModelClasses')
(class (ref: 334))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 486)
(name 'sourceLanguage')
(class (ref: 334))
(container false)
(derived false)
(multivalued false)
(type (ref: 188)))
(FM3.Property (id: 487)
(name 'averageCyclomaticComplexity')
(class (ref: 334))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 488)
(name 'numberOfClasses')
(class (ref: 334))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 489)
(name 'numberOfLinesOfCodePerPackage')
(class (ref: 334))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 490)
(name 'numberOfModelMethods')
(class (ref: 334))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 491)
(name 'numberOfClassesPerPackage')
(class (ref: 334))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 492)
(name 'numberOfLinesOfCodePerMethod')
(class (ref: 334))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))))
(FM3.Class (id: 493)
(name 'PropertyGroup')
(abstract false)
(package (ref: 479))
(superclass (ref: 480))
(properties
(FM3.Property (id: 494)
(name 'propertyRatio')
(class (ref: 493))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 495)
(name 'sizeRatio')
(class (ref: 493))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 496)
(name 'propertyTotalOriginal')
(class (ref: 493))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 497)
(name 'propertyTotal')
(class (ref: 493))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 498)
(name 'property')
(class (ref: 493))
(container false)
(derived false)
(multivalued false)
(type (ref: String)))
(FM3.Property (id: 499)
(name 'sizeOriginal')
(class (ref: 493))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))))
(FM3.Class (id: 23)
(name 'AbstractGroup')
(abstract true)
(package (ref: 479))
(superclass (ref: 500))
(properties
(FM3.Property (id: 501)
(name 'numberOfPackages')
(class (ref: 23))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 502)
(name 'numberOfAssociations')
(class (ref: 23))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 503)
(name 'numberOfLinesOfCode')
(class (ref: 23))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 504)
(name 'numberOfItems')
(class (ref: 23))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 505)
(name 'numberOfEntities')
(class (ref: 23))
(container false)
(derived false)
(multivalued false)
(type (ref: Number)))))
(FM3.Class (id: 3)
(name 'Entity')
(abstract true)
(package (ref: 479))
(superclass (ref: 500))
(properties
(FM3.Property (id: 506)
(name 'isDead')
(class (ref: 3))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 507)
(name 'isTagged')
(class (ref: 3))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 508)
(name 'numberOfTags')
(class (ref: 3))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 11)
(name 'allTagAssociations')
(class (ref: 3))
(container false)
(derived false)
(multivalued true)
(opposite (ref: 10))
(type (ref: 8)))))
(FM3.Class (id: 500)
(name 'Object')
(abstract true)
(package (ref: 479))
(superclass (ref: Object)))))
(FM3.Package (id: 509)
(name 'Moose-Query')
(classes
(FM3.Trait (id: 48)
(name 'TEntityMetaLevelDependency')
(package (ref: 509))
(properties
(FM3.Property (id: 510)
(name 'isDead')
(class (ref: 48))
(container false)
(derived true)
(multivalued false)
(type (ref: Boolean)))
(FM3.Property (id: 511)
(name 'numberOfExternalClients')
(class (ref: 48))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 512)
(name 'numberOfInternalProviders')
(class (ref: 48))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 513)
(name 'numberOfChildren')
(class (ref: 48))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 514)
(name 'numberOfInternalClients')
(class (ref: 48))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 515)
(name 'fanIn')
(class (ref: 48))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 516)
(name 'numberOfDeadChildren')
(class (ref: 48))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 517)
(name 'numberOfExternalProviders')
(class (ref: 48))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))
(FM3.Property (id: 518)
(name 'fanOut')
(class (ref: 48))
(container false)
(derived true)
(multivalued false)
(type (ref: Number)))))
(FM3.Trait (id: 76)
(name 'TAssociationMetaLevelDependency')
(package (ref: 509)))
(FM3.Trait (id: 364)
(name 'TOODependencyQueries')
(package (ref: 509))
(traits (ref: 48))))))
\ No newline at end of file
diff --git a/src/fr/inria/verveine/extractor/java/AbstractDictionary.java b/src/fr/inria/verveine/extractor/java/AbstractDictionary.java
index af641eda..00dcab87 100644
--- a/src/fr/inria/verveine/extractor/java/AbstractDictionary.java
+++ b/src/fr/inria/verveine/extractor/java/AbstractDictionary.java
@@ -2,10 +2,11 @@
import ch.akuhn.fame.Repository;
import fr.inria.verveine.extractor.java.utils.Util;
-import org.moosetechnology.model.famixjava.famixjavaentities.Enum;
-import org.moosetechnology.model.famixjava.famixjavaentities.Package;
-import org.moosetechnology.model.famixjava.famixjavaentities.*;
-import org.moosetechnology.model.famixjava.famixtraits.*;
+
+import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.Enum;
+import org.moosetechnology.model.famix.famixjavaentities.Package;
+import org.moosetechnology.model.famix.famixtraits.*;
import java.lang.Class;
import java.lang.Exception;
@@ -287,8 +288,8 @@ public Type ensureFamixType(B key, String name, TWithTypes owner, boolean persis
* @param persistIt -- whether the Class should be persisted in the Famix repository
* @return the FAMIX Class or null in case of a FAMIX error
*/
- public org.moosetechnology.model.famixjava.famixjavaentities.Class ensureFamixClass(B key, String name, TWithTypes owner, boolean persistIt) {
- org.moosetechnology.model.famixjava.famixjavaentities.Class fmx = ensureFamixEntity(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, key, name, persistIt);
+ public org.moosetechnology.model.famix.famixjavaentities.Class ensureFamixClass(B key, String name, TWithTypes owner, boolean persistIt) {
+ org.moosetechnology.model.famix.famixjavaentities.Class fmx = ensureFamixEntity(org.moosetechnology.model.famix.famixjavaentities.Class.class, key, name, persistIt);
fmx.setTypeContainer(owner);
return fmx;
}
@@ -301,8 +302,8 @@ public org.moosetechnology.model.famixjava.famixjavaentities.Class ensureFamixCl
* @param persistIt -- whether the Class should be persisted in the Famix repository
* @return the FAMIX Class or null in case of a FAMIX error
*/
- public org.moosetechnology.model.famixjava.famixjavaentities.Exception ensureFamixException(B key, String name, TWithTypes owner, boolean persistIt) {
- org.moosetechnology.model.famixjava.famixjavaentities.Exception fmx = ensureFamixEntity(org.moosetechnology.model.famixjava.famixjavaentities.Exception.class, key, name, persistIt);
+ public org.moosetechnology.model.famix.famixjavaentities.Exception ensureFamixException(B key, String name, TWithTypes owner, boolean persistIt) {
+ org.moosetechnology.model.famix.famixjavaentities.Exception fmx = ensureFamixEntity(org.moosetechnology.model.famix.famixjavaentities.Exception.class, key, name, persistIt);
fmx.setTypeContainer(owner);
return fmx;
}
@@ -665,7 +666,7 @@ protected void chainPrevNext(TAssociation prev, TAssociation next) {
* @param excep -- the exception declared to be thrown
* @return the DeclaredException
*/
- public org.moosetechnology.model.famixjava.famixjavaentities.Exception createFamixDeclaredException(Method meth, org.moosetechnology.model.famixjava.famixjavaentities.Exception excep) {
+ public org.moosetechnology.model.famix.famixjavaentities.Exception createFamixDeclaredException(Method meth, org.moosetechnology.model.famix.famixjavaentities.Exception excep) {
if ( (meth == null) || (excep == null) ) {
return null;
}
@@ -683,7 +684,7 @@ public org.moosetechnology.model.famixjava.famixjavaentities.Exception createFam
* @param excep -- the exception caught
* @return the CaughtException
*/
- public org.moosetechnology.model.famixjava.famixjavaentities.Exception createFamixCaughtException(Method meth, org.moosetechnology.model.famixjava.famixjavaentities.Exception excep) {
+ public org.moosetechnology.model.famix.famixjavaentities.Exception createFamixCaughtException(Method meth, org.moosetechnology.model.famix.famixjavaentities.Exception excep) {
if ( (meth == null) || (excep == null) ) {
return null;
}
@@ -703,7 +704,7 @@ public org.moosetechnology.model.famixjava.famixjavaentities.Exception createFam
* @param excep -- the exception thrown
* @return the ThrownException
*/
- public org.moosetechnology.model.famixjava.famixjavaentities.Exception createFamixThrownException(Method meth, org.moosetechnology.model.famixjava.famixjavaentities.Exception excep) {
+ public org.moosetechnology.model.famix.famixjavaentities.Exception createFamixThrownException(Method meth, org.moosetechnology.model.famix.famixjavaentities.Exception excep) {
if ( (meth == null) || (excep == null) ) {
return null;
}
@@ -725,7 +726,7 @@ public org.moosetechnology.model.famixjava.famixjavaentities.Exception createFam
*/
@Deprecated
public ImplicitVariable getImplicitVariableByBinding(B bnd, String iv_name) {
- return getImplicitVariableByType((org.moosetechnology.model.famixjava.famixjavaentities.Class)getEntityByKey(bnd), iv_name);
+ return getImplicitVariableByType((org.moosetechnology.model.famix.famixjavaentities.Class)getEntityByKey(bnd), iv_name);
}
/**
@@ -839,8 +840,8 @@ public Package ensureFamixPackageDefault() {
* Creates or recovers a Famix Class to contain the methods stubs (for which we ignore the real owner).
* @return a Famix class
*/
- public org.moosetechnology.model.famixjava.famixjavaentities.Class ensureFamixClassStubOwner() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class fmx = ensureFamixUniqEntity(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, null, STUB_METHOD_CONTAINER_NAME);
+ public org.moosetechnology.model.famix.famixjavaentities.Class ensureFamixClassStubOwner() {
+ org.moosetechnology.model.famix.famixjavaentities.Class fmx = ensureFamixUniqEntity(org.moosetechnology.model.famix.famixjavaentities.Class.class, null, STUB_METHOD_CONTAINER_NAME);
if (fmx != null) {
fmx.setTypeContainer( ensureFamixPackageDefault());
}
diff --git a/src/fr/inria/verveine/extractor/java/JavaDictionary.java b/src/fr/inria/verveine/extractor/java/JavaDictionary.java
index f1379fd9..6355e1b0 100644
--- a/src/fr/inria/verveine/extractor/java/JavaDictionary.java
+++ b/src/fr/inria/verveine/extractor/java/JavaDictionary.java
@@ -4,16 +4,16 @@
import fr.inria.verveine.extractor.java.utils.ImplicitVarBinding;
import fr.inria.verveine.extractor.java.utils.Util;
import org.eclipse.jdt.core.dom.*;
-import org.moosetechnology.model.famixjava.famixjavaentities.Class;
-import org.moosetechnology.model.famixjava.famixjavaentities.Comment;
-import org.moosetechnology.model.famixjava.famixjavaentities.Enum;
-import org.moosetechnology.model.famixjava.famixjavaentities.Exception;
-import org.moosetechnology.model.famixjava.famixjavaentities.Package;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterizedType;
-import org.moosetechnology.model.famixjava.famixjavaentities.PrimitiveType;
-import org.moosetechnology.model.famixjava.famixjavaentities.Type;
-import org.moosetechnology.model.famixjava.famixjavaentities.*;
-import org.moosetechnology.model.famixjava.famixtraits.*;
+import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.Class;
+import org.moosetechnology.model.famix.famixjavaentities.Comment;
+import org.moosetechnology.model.famix.famixjavaentities.Enum;
+import org.moosetechnology.model.famix.famixjavaentities.Exception;
+import org.moosetechnology.model.famix.famixjavaentities.Package;
+import org.moosetechnology.model.famix.famixjavaentities.ParameterizedType;
+import org.moosetechnology.model.famix.famixjavaentities.PrimitiveType;
+import org.moosetechnology.model.famix.famixjavaentities.Type;
+import org.moosetechnology.model.famix.famixtraits.*;
import java.util.*;
@@ -244,8 +244,8 @@ public boolean isThrowable(ITypeBinding bnd) {
* @return the Famix Entity found or created. May return null if "bnd" is null or in case of a Famix error
*/
@SuppressWarnings("deprecation")
- public org.moosetechnology.model.famixjava.famixjavaentities.Class ensureFamixClass(ITypeBinding bnd, String name, TNamedEntity owner, boolean isGeneric, int modifiers, boolean alwaysPersist) {
- org.moosetechnology.model.famixjava.famixjavaentities.Class fmx = null;
+ public org.moosetechnology.model.famix.famixjavaentities.Class ensureFamixClass(ITypeBinding bnd, String name, TNamedEntity owner, boolean isGeneric, int modifiers, boolean alwaysPersist) {
+ org.moosetechnology.model.famix.famixjavaentities.Class fmx = null;
// --------------- some special cases
if (bnd != null) {
@@ -258,7 +258,7 @@ public org.moosetechnology.model.famixjava.famixjavaentities.Class ensureFamixCl
}
// ---------------- to avoid useless computations if we can
- fmx = (org.moosetechnology.model.famixjava.famixjavaentities.Class) getEntityByKey(bnd);
+ fmx = (org.moosetechnology.model.famix.famixjavaentities.Class) getEntityByKey(bnd);
if (fmx != null) {
return fmx;
}
@@ -300,7 +300,7 @@ public org.moosetechnology.model.famixjava.famixjavaentities.Class ensureFamixCl
}
// --------------- recover from name ?
- for (org.moosetechnology.model.famixjava.famixjavaentities.Class candidate : this.getEntityByName(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, name)) {
+ for (org.moosetechnology.model.famix.famixjavaentities.Class candidate : this.getEntityByName(org.moosetechnology.model.famix.famixjavaentities.Class.class, name)) {
if (matchAndMapClass(bnd, name, (ContainerEntity) owner, candidate)) {
fmx = candidate;
break;
@@ -350,8 +350,8 @@ public org.moosetechnology.model.famixjava.famixjavaentities.Class ensureFamixCl
* @return the Famix Entity found or created. May return null if "bnd" is null or in case of a Famix error
*/
@SuppressWarnings("deprecation")
- public org.moosetechnology.model.famixjava.famixjavaentities.Exception ensureFamixException(ITypeBinding bnd, String name, TWithTypes owner, boolean isGeneric, int modifiers, boolean alwaysPersist) {
- org.moosetechnology.model.famixjava.famixjavaentities.Exception fmx = null;
+ public org.moosetechnology.model.famix.famixjavaentities.Exception ensureFamixException(ITypeBinding bnd, String name, TWithTypes owner, boolean isGeneric, int modifiers, boolean alwaysPersist) {
+ org.moosetechnology.model.famix.famixjavaentities.Exception fmx = null;
// --------------- some special cases
if (bnd != null) {
@@ -364,7 +364,7 @@ public org.moosetechnology.model.famixjava
}
// ---------------- to avoid useless computations if we can
- fmx = (org.moosetechnology.model.famixjava.famixjavaentities.Exception) getEntityByKey(bnd);
+ fmx = (org.moosetechnology.model.famix.famixjavaentities.Exception) getEntityByKey(bnd);
if (fmx != null) {
return fmx;
}
@@ -402,7 +402,7 @@ public org.moosetechnology.model.famixjava
}
// --------------- recover from name ?
- for (org.moosetechnology.model.famixjava.famixjavaentities.Exception candidate : this.getEntityByName(org.moosetechnology.model.famixjava.famixjavaentities.Exception.class, name)) {
+ for (org.moosetechnology.model.famix.famixjavaentities.Exception candidate : this.getEntityByName(org.moosetechnology.model.famix.famixjavaentities.Exception.class, name)) {
if (matchAndMapClass(bnd, name, (T) owner, candidate)) {
fmx = candidate;
break;
@@ -755,11 +755,11 @@ public PrimitiveType ensureFamixPrimitiveType(ITypeBinding bnd, String name) {
return super.ensureFamixPrimitiveType(bnd, name);
}
- public org.moosetechnology.model.famixjava.famixjavaentities.Enum ensureFamixEnum(ITypeBinding bnd, String name, TWithTypes owner) {
- org.moosetechnology.model.famixjava.famixjavaentities.Enum fmx = null;
+ public org.moosetechnology.model.famix.famixjavaentities.Enum ensureFamixEnum(ITypeBinding bnd, String name, TWithTypes owner) {
+ org.moosetechnology.model.famix.famixjavaentities.Enum fmx = null;
// --------------- to avoid useless computations if we can
- fmx = (org.moosetechnology.model.famixjava.famixjavaentities.Enum) getEntityByKey(bnd);
+ fmx = (org.moosetechnology.model.famix.famixjavaentities.Enum) getEntityByKey(bnd);
if (fmx != null) {
return fmx;
}
@@ -784,7 +784,7 @@ public org.moosetechnology.model.famixjava
}
// --------------- recover from name ?
- for (org.moosetechnology.model.famixjava.famixjavaentities.Enum candidate : getEntityByName(org.moosetechnology.model.famixjava.famixjavaentities.Enum.class, name)) {
+ for (org.moosetechnology.model.famix.famixjavaentities.Enum candidate : getEntityByName(org.moosetechnology.model.famix.famixjavaentities.Enum.class, name)) {
if (matchAndMapType(bnd, name, (T) owner, candidate)) {
fmx = candidate;
break;
@@ -805,7 +805,7 @@ public org.moosetechnology.model.famixjava
/**
* helper method, we know the type exists, ensureFamixEnum will recover it
*/
- public org.moosetechnology.model.famixjava.famixjavaentities.Enum getFamixEnum(ITypeBinding bnd, String name, TWithTypes owner) {
+ public org.moosetechnology.model.famix.famixjavaentities.Enum getFamixEnum(ITypeBinding bnd, String name, TWithTypes owner) {
return ensureFamixEnum(bnd, name, owner);
}
@@ -1197,7 +1197,7 @@ else if ( (bnd == null) && (owner == null) ) {
* @return whether the binding matches the candidate (if true , the mapping is recorded)
*/
private boolean matchAndMapClass(ITypeBinding bnd, String name, TNamedEntity owner, TType candidate) {
- if (!(candidate instanceof org.moosetechnology.model.famixjava.famixjavaentities.Class)) {
+ if (!(candidate instanceof org.moosetechnology.model.famix.famixjavaentities.Class)) {
return false;
}
@@ -2149,8 +2149,8 @@ public Package ensureFamixPackageJavaLang(IPackageBinding bnd) {
* @param bnd -- a potential binding for the java "Object" class
* @return a Famix class for "Object"
*/
- public org.moosetechnology.model.famixjava.famixjavaentities.Class ensureFamixClassObject(ITypeBinding bnd) {
- org.moosetechnology.model.famixjava.famixjavaentities.Class fmx = ensureFamixUniqEntity(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, bnd, OBJECT_NAME);
+ public org.moosetechnology.model.famix.famixjavaentities.Class ensureFamixClassObject(ITypeBinding bnd) {
+ org.moosetechnology.model.famix.famixjavaentities.Class fmx = ensureFamixUniqEntity(org.moosetechnology.model.famix.famixjavaentities.Class.class, bnd, OBJECT_NAME);
if (fmx != null) {
fmx.setTypeContainer(ensureFamixPackageJavaLang(null));
@@ -2163,10 +2163,10 @@ public org.moosetechnology.model.famixjava.famixjavaentities.Class ensureFamixCl
/**
* Ensures the Java meta-class: Class<>
*/
- public org.moosetechnology.model.famixjava.famixjavaentities.Class ensureFamixMetaClass(ITypeBinding bnd) {
+ public org.moosetechnology.model.famix.famixjavaentities.Class ensureFamixMetaClass(ITypeBinding bnd) {
Package javaLang = ensureFamixPackageJavaLang((bnd == null) ? null : bnd.getPackage());
// always persist the MetaClass whatever the value of VerveineJParser.classSummary
- org.moosetechnology.model.famixjava.famixjavaentities.Class fmx = this.ensureFamixClass(null, METACLASS_NAME, javaLang, /*isGeneric*/true, Modifier.PUBLIC & Modifier.FINAL, /*alwaysPersist?*/true);
+ org.moosetechnology.model.famix.famixjavaentities.Class fmx = this.ensureFamixClass(null, METACLASS_NAME, javaLang, /*isGeneric*/true, Modifier.PUBLIC & Modifier.FINAL, /*alwaysPersist?*/true);
if ((fmx != null) && (fmx.getSuperInheritances() == null)) {
ensureFamixInheritance(ensureFamixClassObject(null), fmx, null);
@@ -2175,7 +2175,7 @@ public org.moosetechnology.model.famixjava.famixjavaentities.Class ensureFamixMe
return fmx;
}
- public org.moosetechnology.model.famixjava.famixjavaentities.Class getFamixMetaClass(ITypeBinding bnd) {
+ public org.moosetechnology.model.famix.famixjavaentities.Class getFamixMetaClass(ITypeBinding bnd) {
Package javaLang = ensureFamixPackageJavaLang((bnd == null) ? null : bnd.getPackage());
return this.ensureFamixClass(null, METACLASS_NAME, javaLang, /*isGeneric*/true, UNKNOWN_MODIFIERS, /*alwaysPersist?*/false);
}
@@ -2185,8 +2185,8 @@ public org.moosetechnology.model.famixjava.famixjavaentities.Class getFamixMetaC
*
* @return a Famix class
*/
- public org.moosetechnology.model.famixjava.famixjavaentities.Class ensureFamixClassStubOwner() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class fmx = super.ensureFamixClassStubOwner();
+ public org.moosetechnology.model.famix.famixjavaentities.Class ensureFamixClassStubOwner() {
+ org.moosetechnology.model.famix.famixjavaentities.Class fmx = super.ensureFamixClassStubOwner();
ensureFamixInheritance(ensureFamixClassObject(null), fmx, /*prev*/null);
return fmx;
@@ -2199,8 +2199,8 @@ public org.moosetechnology.model.famixjava.famixjavaentities.Class ensureFamixCl
*
* @return a Famix class
*/
- public org.moosetechnology.model.famixjava.famixjavaentities.Class ensureFamixClassArray() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class fmx = ensureFamixUniqEntity(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, null, ARRAYS_NAME);
+ public org.moosetechnology.model.famix.famixjavaentities.Class ensureFamixClassArray() {
+ org.moosetechnology.model.famix.famixjavaentities.Class fmx = ensureFamixUniqEntity(org.moosetechnology.model.famix.famixjavaentities.Class.class, null, ARRAYS_NAME);
if (fmx != null) {
ensureFamixInheritance(ensureFamixClassObject(null), fmx, /*prev*/null);
fmx.setContainer(ensureFamixPackageDefault());
diff --git a/src/fr/inria/verveine/extractor/java/VerveineJParser.java b/src/fr/inria/verveine/extractor/java/VerveineJParser.java
index 9aa69cf9..ea77a89f 100644
--- a/src/fr/inria/verveine/extractor/java/VerveineJParser.java
+++ b/src/fr/inria/verveine/extractor/java/VerveineJParser.java
@@ -5,15 +5,15 @@
import fr.inria.verveine.extractor.java.utils.Util;
import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTParser;
-import org.moosetechnology.model.famixjava.famixjavaentities.Entity;
-import org.moosetechnology.model.famixjava.famixjavaentities.FamixJavaEntitiesModel;
-import org.moosetechnology.model.famixjava.famixjavaentities.Package;
-import org.moosetechnology.model.famixjava.famixjavaentities.SourceLanguage;
-import org.moosetechnology.model.famixjava.famixreplication.FamixReplicationModel;
-import org.moosetechnology.model.famixjava.famixtraits.FamixTraitsModel;
-import org.moosetechnology.model.famixjava.moose.MooseModel;
-import org.moosetechnology.model.famixjava.moosequery.MooseQueryModel;
-import org.moosetechnology.model.famixjava.tagging.TaggingModel;
+import org.moosetechnology.model.famix.famixjavaentities.Entity;
+import org.moosetechnology.model.famix.famixjavaentities.FamixJavaEntitiesModel;
+import org.moosetechnology.model.famix.famixjavaentities.Package;
+import org.moosetechnology.model.famix.famixjavaentities.SourceLanguage;
+import org.moosetechnology.model.famix.famixreplication.FamixReplicationModel;
+import org.moosetechnology.model.famix.famixtraits.FamixTraitsModel;
+import org.moosetechnology.model.famix.moose.MooseModel;
+import org.moosetechnology.model.famix.moosequery.MooseQueryModel;
+import org.moosetechnology.model.famix.tagging.TaggingModel;
import java.io.*;
import java.nio.charset.StandardCharsets;
diff --git a/src/fr/inria/verveine/extractor/java/utils/EntityStack.java b/src/fr/inria/verveine/extractor/java/utils/EntityStack.java
index 6e9970c6..d5d818b3 100644
--- a/src/fr/inria/verveine/extractor/java/utils/EntityStack.java
+++ b/src/fr/inria/verveine/extractor/java/utils/EntityStack.java
@@ -1,15 +1,15 @@
package fr.inria.verveine.extractor.java.utils;
-import org.moosetechnology.model.famixjava.famixjavaentities.Package;
-import org.moosetechnology.model.famixjava.famixtraits.TAccess;
-import org.moosetechnology.model.famixjava.famixtraits.TAnnotationTypeAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocation;
-import org.moosetechnology.model.famixjava.famixtraits.TMethod;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TPackage;
-import org.moosetechnology.model.famixjava.famixtraits.TReference;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.Package;
+import org.moosetechnology.model.famix.famixtraits.TAccess;
+import org.moosetechnology.model.famix.famixtraits.TAnnotationTypeAttribute;
+import org.moosetechnology.model.famix.famixtraits.TInvocation;
+import org.moosetechnology.model.famix.famixtraits.TMethod;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TPackage;
+import org.moosetechnology.model.famix.famixtraits.TReference;
+import org.moosetechnology.model.famix.famixtraits.TType;
import java.lang.Class;
import java.util.Stack;
diff --git a/src/fr/inria/verveine/extractor/java/utils/FamixJavaCodegen.java b/src/fr/inria/verveine/extractor/java/utils/FamixJavaCodegen.java
new file mode 100644
index 00000000..d1f23f4f
--- /dev/null
+++ b/src/fr/inria/verveine/extractor/java/utils/FamixJavaCodegen.java
@@ -0,0 +1,53 @@
+// Copyright (c) 2007-2008 University of Bern, Switzerland
+//
+// Written by Adrian Kuhn
+//
+// This file is part of 'Fame Code Generation (for Java)'.
+//
+// 'Fame Code Generation (for Java)' 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.
+//
+// 'Fame Code Generation (for Java)' 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 'Fame Code Generation (for Java)'. If not, see
+// .
+//
+
+package fr.inria.verveine.extractor.java.utils;
+
+import ch.akuhn.fame.MetaRepository;
+import ch.akuhn.fame.Repository;
+import ch.akuhn.fame.codegen.CodeGeneration;
+import ch.akuhn.fame.parser.Importer;
+import ch.akuhn.fame.parser.InputSource;
+
+import static ch.akuhn.util.Out.puts;
+
+public class FamixJavaCodegen {
+
+ public static void main(String... args) {
+ InputSource input = InputSource.fromResource("famixJava.mse");
+ MetaRepository fm3 = MetaRepository.createFM3();
+ Importer builder = new Importer(fm3);
+ builder.readFrom(input);
+ Repository famix = builder.getResult();
+ CodeGeneration gen = new CodeGeneration(/*destinationPackage*/"org.moosetechnology.model.famix", /*outputDirectory*/"gen", /*classNamePrefix*/"");
+ gen.accept(famix);
+ puts("done");
+ }
+
+ /*
+ * Note: must add this method to org.moosetechnology.model.famix.famixjavaentities.NamedEntity
+ *
+ * @Override
+ * public String toString() {
+ * return getClass().getSimpleName() + "(" + getName() + ")";
+ * }
+ */
+}
diff --git a/src/fr/inria/verveine/extractor/java/utils/ImplicitVarBinding.java b/src/fr/inria/verveine/extractor/java/utils/ImplicitVarBinding.java
index 903c479d..5e4fe787 100644
--- a/src/fr/inria/verveine/extractor/java/utils/ImplicitVarBinding.java
+++ b/src/fr/inria/verveine/extractor/java/utils/ImplicitVarBinding.java
@@ -3,8 +3,7 @@
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.dom.IAnnotationBinding;
import org.eclipse.jdt.core.dom.IBinding;
-import org.moosetechnology.model.famixjava.famixjavaentities.Method;
-import org.moosetechnology.model.famixjava.famixtraits.TMethod;
+import org.moosetechnology.model.famix.famixtraits.TMethod;
import fr.inria.verveine.extractor.java.AbstractDictionary;
import java.util.Hashtable;
diff --git a/src/fr/inria/verveine/extractor/java/utils/StubBinding.java b/src/fr/inria/verveine/extractor/java/utils/StubBinding.java
index b7385679..f45f5c36 100644
--- a/src/fr/inria/verveine/extractor/java/utils/StubBinding.java
+++ b/src/fr/inria/verveine/extractor/java/utils/StubBinding.java
@@ -3,7 +3,6 @@
import fr.inria.verveine.extractor.java.JavaDictionary;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.dom.*;
-import org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;
import java.util.HashMap;
import java.util.List;
diff --git a/src/fr/inria/verveine/extractor/java/utils/Util.java b/src/fr/inria/verveine/extractor/java/utils/Util.java
index 02b5142c..fdfe472c 100644
--- a/src/fr/inria/verveine/extractor/java/utils/Util.java
+++ b/src/fr/inria/verveine/extractor/java/utils/Util.java
@@ -8,15 +8,12 @@
import org.eclipse.jdt.core.dom.LambdaExpression;
import org.eclipse.jdt.core.dom.QualifiedType;
import org.eclipse.jdt.core.dom.SimpleType;
-import org.moosetechnology.model.famixjava.famixjavaentities.ContainerEntity;
-import org.moosetechnology.model.famixjava.famixjavaentities.Entity;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
import java.util.stream.Collectors;
-import fr.inria.verveine.extractor.java.JavaDictionary;
public class Util {
diff --git a/src/fr/inria/verveine/extractor/java/utils/VerveineUtilsForTests.java b/src/fr/inria/verveine/extractor/java/utils/VerveineUtilsForTests.java
index 31af5cae..9425d5c1 100644
--- a/src/fr/inria/verveine/extractor/java/utils/VerveineUtilsForTests.java
+++ b/src/fr/inria/verveine/extractor/java/utils/VerveineUtilsForTests.java
@@ -1,51 +1,41 @@
package fr.inria.verveine.extractor.java.utils;
import ch.akuhn.fame.Repository;
-import org.moosetechnology.model.famixjava.famixjavaentities.Entity;
-import org.moosetechnology.model.famixjava.famixjavaentities.NamedEntity;
import java.util.Collection;
-import java.util.Iterator;
import java.util.Vector;
+import org.moosetechnology.model.famix.famixjavaentities.Entity;
+import org.moosetechnology.model.famix.famixjavaentities.NamedEntity;
+
public class VerveineUtilsForTests {
public VerveineUtilsForTests() {
}
- public static Collection selectElementsOfType(Repository var0, Class var1) {
- return var0.all(var1);
+ public static Collection selectElementsOfType(Repository repository, Class fmxClass) {
+ return repository.all(fmxClass);
}
- public static T detectFamixElement(Repository var0, Class var1, String var2) {
- Iterator var3 = selectElementsOfType(var0, var1).iterator();
-
- NamedEntity var4;
- do {
- if (!var3.hasNext()) {
- return null;
+ public static T detectFamixElement(Repository repository, Class fmxClass, String name) {
+ for (T ent : selectElementsOfType(repository, fmxClass)) {
+ if (ent.getName().equals(name) ) {
+ return ent;
}
-
- var4 = (NamedEntity)var3.next();
- } while(!var4.getName().equals(var2));
-
- return (T) var4;
+ }
+ return null;
}
- public static Collection listFamixElements(Repository var0, String var1) {
- return listFamixElements(var0, NamedEntity.class, var1);
+ public static Collection listFamixElements(Repository repository, String name) {
+ return listFamixElements(repository, NamedEntity.class, name);
}
- public static Collection listFamixElements(Repository var0, Class var1, String var2) {
- Vector var3 = new Vector();
- Iterator var4 = selectElementsOfType(var0, var1).iterator();
-
- while(var4.hasNext()) {
- NamedEntity var5 = (NamedEntity)var4.next();
- if (var5.getName().equals(var2)) {
- var3.add(var5);
+ public static Collection listFamixElements(Repository repository, Class fmxClass, String name) {
+ Collection selection = new Vector();
+ for (T ent : selectElementsOfType(repository, fmxClass)) {
+ if ( ent.getName().equals(name) ) {
+ selection.add(ent);
}
}
-
- return var3;
+ return selection;
}
}
diff --git a/src/fr/inria/verveine/extractor/java/visitors/GetVisitedEntityAbstractVisitor.java b/src/fr/inria/verveine/extractor/java/visitors/GetVisitedEntityAbstractVisitor.java
index f5a569c1..73b27ca7 100644
--- a/src/fr/inria/verveine/extractor/java/visitors/GetVisitedEntityAbstractVisitor.java
+++ b/src/fr/inria/verveine/extractor/java/visitors/GetVisitedEntityAbstractVisitor.java
@@ -6,13 +6,12 @@
import fr.inria.verveine.extractor.java.utils.StubBinding;
import fr.inria.verveine.extractor.java.utils.Util;
import org.eclipse.jdt.core.dom.*;
-import org.moosetechnology.model.famixjava.famixjavaentities.Package;
-import org.moosetechnology.model.famixjava.famixjavaentities.Type;
-import org.moosetechnology.model.famixjava.famixjavaentities.*;
-import org.moosetechnology.model.famixjava.famixtraits.TMethod;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TWithMethods;
-import org.moosetechnology.model.famixjava.famixtraits.TWithTypes;
+import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.Package;
+import org.moosetechnology.model.famix.famixtraits.TMethod;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TWithMethods;
+import org.moosetechnology.model.famix.famixtraits.TWithTypes;
import java.util.ArrayList;
import java.util.Collection;
@@ -119,7 +118,7 @@ protected TType visitTypeDeclaration(TypeDeclaration node) {
}
protected void endVisitTypeDeclaration(TypeDeclaration node) {
- if (context.topType() instanceof org.moosetechnology.model.famixjava.famixjavaentities.Class || context.topType() instanceof Interface) {
+ if (context.topType() instanceof org.moosetechnology.model.famix.famixjavaentities.Class || context.topType() instanceof Interface) {
context.pop();
}
super.endVisit(node);
@@ -139,8 +138,8 @@ protected void visitClassInstanceCreation(ClassInstanceCreation node) {
/**
* See field {@link GetVisitedEntityAbstractVisitor#anonymousSuperTypeName}
*/
- protected org.moosetechnology.model.famixjava.famixjavaentities.Class visitAnonymousClassDeclaration(AnonymousClassDeclaration node) {
- org.moosetechnology.model.famixjava.famixjavaentities.Class fmx;
+ protected org.moosetechnology.model.famix.famixjavaentities.Class visitAnonymousClassDeclaration(AnonymousClassDeclaration node) {
+ org.moosetechnology.model.famix.famixjavaentities.Class fmx;
ITypeBinding bnd = (ITypeBinding) StubBinding.getDeclarationBinding(node);
@@ -152,7 +151,7 @@ protected org.moosetechnology.model.famixjava.famixjavaentities.Class visitAnony
}
protected void endVisitAnonymousClassDeclaration(AnonymousClassDeclaration node) {
- if (context.top() instanceof org.moosetechnology.model.famixjava.famixjavaentities.Class) {
+ if (context.top() instanceof org.moosetechnology.model.famix.famixjavaentities.Class) {
context.pop();
}
if (!anonymousSuperTypeName.empty()) {
@@ -160,10 +159,10 @@ protected void endVisitAnonymousClassDeclaration(AnonymousClassDeclaration node)
}
}
- protected org.moosetechnology.model.famixjava.famixjavaentities.Enum visitEnumDeclaration(EnumDeclaration node) {
+ protected org.moosetechnology.model.famix.famixjavaentities.Enum visitEnumDeclaration(EnumDeclaration node) {
ITypeBinding bnd = (ITypeBinding) StubBinding.getDeclarationBinding(node);
- org.moosetechnology.model.famixjava.famixjavaentities.Enum fmx = dico.getFamixEnum(bnd, node.getName().getIdentifier(), (TWithTypes) context.top());
+ org.moosetechnology.model.famix.famixjavaentities.Enum fmx = dico.getFamixEnum(bnd, node.getName().getIdentifier(), (TWithTypes) context.top());
if (fmx != null) {
this.context.pushType(fmx);
}
@@ -171,7 +170,7 @@ protected org.moosetechnology.model.famixjava.famixjavaentities.Enum visitEnumDe
}
protected void endVisitEnumDeclaration(EnumDeclaration node) {
- if (context.top() instanceof org.moosetechnology.model.famixjava.famixjavaentities.Enum) {
+ if (context.top() instanceof org.moosetechnology.model.famix.famixjavaentities.Enum) {
this.context.popType();
}
super.endVisit(node);
diff --git a/src/fr/inria/verveine/extractor/java/visitors/ResolverCheckVisitor.java b/src/fr/inria/verveine/extractor/java/visitors/ResolverCheckVisitor.java
index 962f2655..e0011508 100644
--- a/src/fr/inria/verveine/extractor/java/visitors/ResolverCheckVisitor.java
+++ b/src/fr/inria/verveine/extractor/java/visitors/ResolverCheckVisitor.java
@@ -5,8 +5,6 @@
import org.eclipse.jdt.core.dom.*;
-import fr.inria.verveine.extractor.java.utils.Util;
-
public class ResolverCheckVisitor extends ASTVisitor {
@Override
diff --git a/src/fr/inria/verveine/extractor/java/visitors/SummarizingClassesAbstractVisitor.java b/src/fr/inria/verveine/extractor/java/visitors/SummarizingClassesAbstractVisitor.java
index b3340ee6..11d19c8e 100644
--- a/src/fr/inria/verveine/extractor/java/visitors/SummarizingClassesAbstractVisitor.java
+++ b/src/fr/inria/verveine/extractor/java/visitors/SummarizingClassesAbstractVisitor.java
@@ -2,11 +2,9 @@
import fr.inria.verveine.extractor.java.JavaDictionary;
import fr.inria.verveine.extractor.java.VerveineJOptions;
-import fr.inria.verveine.extractor.java.VerveineJParser;
import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.moosetechnology.model.famixjava.famixjavaentities.NamedEntity;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterType;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixjavaentities.ParameterType;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
/**
* A conveniency class to introduce the {@link #classSummary} flag and a method that uses it.
diff --git a/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorClassMethodDef.java b/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorClassMethodDef.java
index 8c3b95d2..4860456e 100644
--- a/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorClassMethodDef.java
+++ b/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorClassMethodDef.java
@@ -45,16 +45,16 @@
import org.eclipse.jdt.core.dom.VariableDeclaration;
import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
import org.eclipse.jdt.core.dom.WhileStatement;
-import org.moosetechnology.model.famixjava.famixjavaentities.AnnotationType;
-import org.moosetechnology.model.famixjava.famixjavaentities.AnnotationTypeAttribute;
-import org.moosetechnology.model.famixjava.famixjavaentities.ContainerEntity;
-import org.moosetechnology.model.famixjava.famixjavaentities.Method;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterType;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterizedType;
-import org.moosetechnology.model.famixjava.famixtraits.TMethod;
-import org.moosetechnology.model.famixjava.famixtraits.TWithMethods;
-import org.moosetechnology.model.famixjava.famixtraits.TWithParameterizedTypes;
-import org.moosetechnology.model.famixjava.famixtraits.TWithTypes;
+import org.moosetechnology.model.famix.famixjavaentities.AnnotationType;
+import org.moosetechnology.model.famix.famixjavaentities.AnnotationTypeAttribute;
+import org.moosetechnology.model.famix.famixjavaentities.ContainerEntity;
+import org.moosetechnology.model.famix.famixjavaentities.Method;
+import org.moosetechnology.model.famix.famixjavaentities.ParameterType;
+import org.moosetechnology.model.famix.famixjavaentities.ParameterizedType;
+import org.moosetechnology.model.famix.famixtraits.TMethod;
+import org.moosetechnology.model.famix.famixtraits.TWithMethods;
+import org.moosetechnology.model.famix.famixtraits.TWithParameterizedTypes;
+import org.moosetechnology.model.famix.famixtraits.TWithTypes;
import fr.inria.verveine.extractor.java.JavaDictionary;
import fr.inria.verveine.extractor.java.VerveineJOptions;
@@ -106,7 +106,7 @@ public boolean visit(TypeDeclaration node) {
boolean persistIt = persistClass(bnd);
// may be could use this.refereredType instead of dico.ensureFamixClass ?
- org.moosetechnology.model.famixjava.famixtraits.TType fmx;
+ org.moosetechnology.model.famix.famixtraits.TType fmx;
if (bnd.isInterface()) {
fmx = dico.ensureFamixInterface(
bnd,
@@ -197,7 +197,7 @@ public boolean visit(ClassInstanceCreation node) {
@Override
public boolean visit(AnonymousClassDeclaration node) {
// System.err.println("TRACE, Visiting AnonymousClassDeclaration");
- org.moosetechnology.model.famixjava.famixjavaentities.Type fmx;
+ org.moosetechnology.model.famix.famixjavaentities.Type fmx;
ITypeBinding bnd = (ITypeBinding) StubBinding.getDeclarationBinding(node);
int modifiers = (bnd != null) ? bnd.getModifiers() : JavaDictionary.UNKNOWN_MODIFIERS;
@@ -248,7 +248,7 @@ public boolean visit(EnumDeclaration node) {
// System.err.println("TRACE, Visiting EnumDeclaration: "+node.getName().getIdentifier());
ITypeBinding bnd = (ITypeBinding) StubBinding.getDeclarationBinding(node);
- org.moosetechnology.model.famixjava.famixjavaentities.Enum fmx = dico.ensureFamixEnum(bnd, node.getName().getIdentifier(), (TWithTypes) context.top());
+ org.moosetechnology.model.famix.famixjavaentities.Enum fmx = dico.ensureFamixEnum(bnd, node.getName().getIdentifier(), (TWithTypes) context.top());
if (fmx != null) {
Util.recursivelySetIsStub(fmx, false);
diff --git a/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorComments.java b/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorComments.java
index e794eed8..7a12c17d 100644
--- a/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorComments.java
+++ b/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorComments.java
@@ -6,15 +6,14 @@
import fr.inria.verveine.extractor.java.visitors.GetVisitedEntityAbstractVisitor;
import fr.inria.verveine.extractor.java.visitors.SummarizingClassesAbstractVisitor;
import org.eclipse.jdt.core.dom.*;
-import org.moosetechnology.model.famixjava.famixjavaentities.AnnotationTypeAttribute;
-import org.moosetechnology.model.famixjava.famixjavaentities.Attribute;
-import org.moosetechnology.model.famixjava.famixjavaentities.Method;
-import org.moosetechnology.model.famixjava.famixjavaentities.Parameter;
-import org.moosetechnology.model.famixjava.famixjavaentities.Type;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TStructuralEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAttributes;
-import org.moosetechnology.model.famixjava.famixtraits.TWithComments;
+import org.moosetechnology.model.famix.famixjavaentities.AnnotationTypeAttribute;
+import org.moosetechnology.model.famix.famixjavaentities.Attribute;
+import org.moosetechnology.model.famix.famixjavaentities.Method;
+import org.moosetechnology.model.famix.famixjavaentities.Parameter;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TStructuralEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAttributes;
+import org.moosetechnology.model.famix.famixtraits.TWithComments;
/**
* AST Visitor that defines all the (Famix) entities of interest
diff --git a/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorPackageDef.java b/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorPackageDef.java
index cd3ce240..801ddfe2 100644
--- a/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorPackageDef.java
+++ b/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorPackageDef.java
@@ -4,7 +4,7 @@
import fr.inria.verveine.extractor.java.VerveineJOptions;
import fr.inria.verveine.extractor.java.utils.EntityStack;
import org.eclipse.jdt.core.dom.*;
-import org.moosetechnology.model.famixjava.famixjavaentities.Package;
+import org.moosetechnology.model.famix.famixjavaentities.Package;
/**
* AST Visitor that defines all the (Famix) entities of interest
diff --git a/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorVarsDef.java b/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorVarsDef.java
index 88879c6b..da479006 100644
--- a/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorVarsDef.java
+++ b/src/fr/inria/verveine/extractor/java/visitors/defvisitors/VisitorVarsDef.java
@@ -7,13 +7,12 @@
import fr.inria.verveine.extractor.java.utils.StructuralEntityKinds;
import fr.inria.verveine.extractor.java.visitors.GetVisitedEntityAbstractVisitor;
import org.eclipse.jdt.core.dom.*;
-import org.moosetechnology.model.famixjava.famixjavaentities.Enum;
-import org.moosetechnology.model.famixjava.famixjavaentities.*;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TStructuralEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAttributes;
+import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.Enum;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TStructuralEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAttributes;
import java.util.List;
@@ -291,7 +290,7 @@ public boolean visit(SuperConstructorInvocation node) {
// "SomeClass.class"
public boolean visit(TypeLiteral node) {
- org.moosetechnology.model.famixjava.famixjavaentities.Type javaMetaClass = dico.getFamixMetaClass(null);
+ org.moosetechnology.model.famix.famixjavaentities.Type javaMetaClass = dico.getFamixMetaClass(null);
dico.ensureFamixAttribute(null, "class", javaMetaClass, (TWithAttributes) javaMetaClass, /*persistIt*/! summarizeClasses());
return super.visit(node);
diff --git a/src/fr/inria/verveine/extractor/java/visitors/refvisitors/AbstractRefVisitor.java b/src/fr/inria/verveine/extractor/java/visitors/refvisitors/AbstractRefVisitor.java
index bb6c76ea..1e5202f5 100644
--- a/src/fr/inria/verveine/extractor/java/visitors/refvisitors/AbstractRefVisitor.java
+++ b/src/fr/inria/verveine/extractor/java/visitors/refvisitors/AbstractRefVisitor.java
@@ -4,14 +4,13 @@
import fr.inria.verveine.extractor.java.VerveineJOptions;
import fr.inria.verveine.extractor.java.visitors.SummarizingClassesAbstractVisitor;
import org.eclipse.jdt.core.dom.*;
-import org.moosetechnology.model.famixjava.famixjavaentities.ContainerEntity;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterizableClass;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterizableInterface;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TParameterizedTypeUser;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TWithParameterizedTypes;
-import org.moosetechnology.model.famixjava.famixtraits.TWithTypes;
+import org.moosetechnology.model.famix.famixjavaentities.ContainerEntity;
+import org.moosetechnology.model.famix.famixjavaentities.ParameterizableInterface;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TParameterizedTypeUser;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TWithParameterizedTypes;
+import org.moosetechnology.model.famix.famixtraits.TWithTypes;
/**
* A collection of useful utility methods that are needed in various ref visitors
@@ -103,7 +102,7 @@ else if (isClass && !isExcep) {
* Same as {@link AbstractRefVisitor#referedType(Type, ContainerEntity, boolean)} but with a type binding as first argument instead of a Type
*/
protected TType referedType(ITypeBinding bnd, TNamedEntity ctxt, boolean isClass) {
- org.moosetechnology.model.famixjava.famixtraits.TType fmxTyp = null;
+ org.moosetechnology.model.famix.famixtraits.TType fmxTyp = null;
if (bnd == null) {
return null;
@@ -139,7 +138,7 @@ protected TType referedType(ITypeBinding bnd, TNamedEntity ctxt, boolean isClas
for (ITypeBinding targ : bnd.getTypeArguments()) {
TType fmxTArg = this.referedType(targ, ctxt, false);
if ((fmxTArg != null) && persistClass(targ)) {
- ((org.moosetechnology.model.famixjava.famixjavaentities.ParameterizedType) fmxTyp).addArguments((TParameterizedTypeUser) fmxTArg);
+ ((org.moosetechnology.model.famix.famixjavaentities.ParameterizedType) fmxTyp).addArguments((TParameterizedTypeUser) fmxTArg);
}
}
} else {
diff --git a/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorAccessRef.java b/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorAccessRef.java
index 2cedb62e..eb71e759 100644
--- a/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorAccessRef.java
+++ b/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorAccessRef.java
@@ -5,17 +5,15 @@
import fr.inria.verveine.extractor.java.utils.ImplicitVarBinding;
import fr.inria.verveine.extractor.java.utils.NodeTypeChecker;
import org.eclipse.jdt.core.dom.*;
-import org.moosetechnology.model.famixjava.famixjavaentities.Enum;
-import org.moosetechnology.model.famixjava.famixjavaentities.PrimitiveType;
-import org.moosetechnology.model.famixjava.famixjavaentities.Type;
-import org.moosetechnology.model.famixjava.famixjavaentities.*;
-import org.moosetechnology.model.famixjava.famixtraits.TAccess;
-import org.moosetechnology.model.famixjava.famixtraits.TAccessible;
-import org.moosetechnology.model.famixjava.famixtraits.TMethod;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TStructuralEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAccesses;
-import org.moosetechnology.model.famixjava.famixtraits.TWithAttributes;
+import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.Enum;
+import org.moosetechnology.model.famix.famixjavaentities.PrimitiveType;
+import org.moosetechnology.model.famix.famixjavaentities.Type;
+import org.moosetechnology.model.famix.famixtraits.TAccess;
+import org.moosetechnology.model.famix.famixtraits.TMethod;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TStructuralEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithAttributes;
import java.util.List;
@@ -472,7 +470,7 @@ private void visitAssignment(Expression lhs, Expression rhs) {
}
private TStructuralEntity ensureAccessedStructEntity(IVariableBinding bnd, String name,
- org.moosetechnology.model.famixjava.famixjavaentities.Type typ, ContainerEntity owner, TMethod accessor) {
+ org.moosetechnology.model.famix.famixjavaentities.Type typ, ContainerEntity owner, TMethod accessor) {
TStructuralEntity accessed = null;
if (bnd == null) {
@@ -557,7 +555,7 @@ else if (accessed instanceof ImplicitVariable && ((ImplicitVariable) accessed).g
return true;
}
if (((TNamedEntity) accessor.getParentType()).getName().startsWith(JavaDictionary.ANONYMOUS_NAME_PREFIX)) {
- return localVariable(accessed, ((Method) ((org.moosetechnology.model.famixjava.famixjavaentities.Type) accessor.getParentType()).getTypeContainer()));
+ return localVariable(accessed, ((Method) ((org.moosetechnology.model.famix.famixjavaentities.Type) accessor.getParentType()).getTypeContainer()));
}
return false;
}
diff --git a/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorAnnotationRef.java b/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorAnnotationRef.java
index 372750cb..620fe630 100644
--- a/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorAnnotationRef.java
+++ b/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorAnnotationRef.java
@@ -4,10 +4,10 @@
import fr.inria.verveine.extractor.java.VerveineJOptions;
import fr.inria.verveine.extractor.java.visitors.SummarizingClassesAbstractVisitor;
import org.eclipse.jdt.core.dom.*;
-import org.moosetechnology.model.famixjava.famixjavaentities.AnnotationInstanceAttribute;
-import org.moosetechnology.model.famixjava.famixjavaentities.AnnotationType;
-import org.moosetechnology.model.famixjava.famixjavaentities.AnnotationTypeAttribute;
-import org.moosetechnology.model.famixjava.famixjavaentities.NamedEntity;
+import org.moosetechnology.model.famix.famixjavaentities.AnnotationInstanceAttribute;
+import org.moosetechnology.model.famix.famixjavaentities.AnnotationType;
+import org.moosetechnology.model.famix.famixjavaentities.AnnotationTypeAttribute;
+import org.moosetechnology.model.famix.famixjavaentities.NamedEntity;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorExceptionRef.java b/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorExceptionRef.java
index 2682e610..49f44d29 100644
--- a/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorExceptionRef.java
+++ b/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorExceptionRef.java
@@ -4,14 +4,12 @@
import fr.inria.verveine.extractor.java.VerveineJOptions;
import fr.inria.verveine.extractor.java.utils.NodeTypeChecker;
import org.eclipse.jdt.core.dom.*;
-import org.moosetechnology.model.famixjava.famixjavaentities.Class;
-import org.moosetechnology.model.famixjava.famixjavaentities.ContainerEntity;
-import org.moosetechnology.model.famixjava.famixjavaentities.Exception;
-import org.moosetechnology.model.famixjava.famixjavaentities.Method;
-import org.moosetechnology.model.famixjava.famixjavaentities.Package;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterType;
-import org.moosetechnology.model.famixjava.famixtraits.TMethod;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
+import org.moosetechnology.model.famix.famixjavaentities.ContainerEntity;
+import org.moosetechnology.model.famix.famixjavaentities.Exception;
+import org.moosetechnology.model.famix.famixjavaentities.Method;
+import org.moosetechnology.model.famix.famixjavaentities.Package;
+import org.moosetechnology.model.famix.famixjavaentities.ParameterType;
+import org.moosetechnology.model.famix.famixtraits.TType;
import java.util.List;
@@ -89,9 +87,9 @@ public boolean visit(CatchClause node) {
Method meth = (Method) this.context.topMethod();
Type excepClass = node.getException().getType();
if (meth != null) {
- org.moosetechnology.model.famixjava.famixjavaentities.Exception excepFmx = null;
+ org.moosetechnology.model.famix.famixjavaentities.Exception excepFmx = null;
if ( NodeTypeChecker.isSimpleType(excepClass) || NodeTypeChecker.isQualifiedType(excepClass) ) {
- excepFmx = (org.moosetechnology.model.famixjava.famixjavaentities.Exception) referedType(excepClass, meth, true, true);
+ excepFmx = (org.moosetechnology.model.famix.famixjavaentities.Exception) referedType(excepClass, meth, true, true);
}
if (excepFmx != null) {
if (! summarizeClasses()) {
@@ -106,7 +104,7 @@ public boolean visit(CatchClause node) {
@Override
public boolean visit(ThrowStatement node) {
Method meth = (Method) this.context.topMethod();
- org.moosetechnology.model.famixjava.famixjavaentities.Exception excepFmx = (org.moosetechnology.model.famixjava.famixjavaentities.Exception) this
+ org.moosetechnology.model.famix.famixjavaentities.Exception excepFmx = (org.moosetechnology.model.famix.famixjavaentities.Exception) this
.referedType(node.getExpression().resolveTypeBinding(), (ContainerEntity) context.topType(), true);
if (excepFmx != null) {
if (! summarizeClasses()) {
diff --git a/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorInheritanceRef.java b/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorInheritanceRef.java
index 82ff798b..c1a08518 100644
--- a/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorInheritanceRef.java
+++ b/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorInheritanceRef.java
@@ -6,18 +6,14 @@
import fr.inria.verveine.extractor.java.utils.Util;
import fr.inria.verveine.extractor.java.visitors.SummarizingClassesAbstractVisitor;
import org.eclipse.jdt.core.dom.*;
-import org.moosetechnology.model.famixjava.famixjavaentities.Package;
-import org.moosetechnology.model.famixjava.famixjavaentities.Type;
-import org.moosetechnology.model.famixjava.famixjavaentities.*;
-import org.moosetechnology.model.famixjava.famixtraits.TAssociation;
-import org.moosetechnology.model.famixjava.famixtraits.TCanImplement;
-import org.moosetechnology.model.famixjava.famixtraits.TImplementable;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TWithInheritances;
-import org.moosetechnology.model.famixjava.famixtraits.TWithTypes;
-
-import java.util.Collection;
-import java.util.LinkedList;
+import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.Package;
+import org.moosetechnology.model.famix.famixtraits.TAssociation;
+import org.moosetechnology.model.famix.famixtraits.TCanImplement;
+import org.moosetechnology.model.famix.famixtraits.TImplementable;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TWithInheritances;
+import org.moosetechnology.model.famix.famixtraits.TWithTypes;
/** A visitor to record inheritance relationships.
* It is simpler than the other ref visitors
@@ -56,7 +52,7 @@ public boolean visit(AnonymousClassDeclaration node) {
// ITypeBinding bnd = node.resolveBinding();
ITypeBinding bnd = (ITypeBinding) StubBinding.getDeclarationBinding(node);
- org.moosetechnology.model.famixjava.famixjavaentities.Class fmx = this.dico.getFamixClass(bnd, Util.stringForAnonymousName(getAnonymousSuperTypeName(), context), /*owner*/(ContainerEntity) context.top());
+ org.moosetechnology.model.famix.famixjavaentities.Class fmx = this.dico.getFamixClass(bnd, Util.stringForAnonymousName(getAnonymousSuperTypeName(), context), /*owner*/(ContainerEntity) context.top());
if ((fmx != null) && (bnd != null) && (!summarizeClasses())) {
ensureInheritances(bnd, fmx);
@@ -75,7 +71,7 @@ public void endVisit(AnonymousClassDeclaration node) {
public boolean visit(EnumDeclaration node) {
ITypeBinding bnd = node.resolveBinding();
- org.moosetechnology.model.famixjava.famixjavaentities.Enum fmx = dico.getFamixEnum(bnd, node.getName().getIdentifier(), (TWithTypes) context.top());
+ org.moosetechnology.model.famix.famixjavaentities.Enum fmx = dico.getFamixEnum(bnd, node.getName().getIdentifier(), (TWithTypes) context.top());
if ((fmx != null) && (bnd != null)) {
// --------------- implicit superclass java.lang.Enum<> cannot use ensureInheritances(bnd,fmx)
diff --git a/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorInvocRef.java b/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorInvocRef.java
index a816e91d..396b13ff 100644
--- a/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorInvocRef.java
+++ b/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorInvocRef.java
@@ -9,9 +9,9 @@
import fr.inria.verveine.extractor.java.visitors.GetVisitedEntityAbstractVisitor;
import org.eclipse.jdt.core.dom.Type;
import org.eclipse.jdt.core.dom.*;
-import org.moosetechnology.model.famixjava.famixjavaentities.Class;
-import org.moosetechnology.model.famixjava.famixjavaentities.*;
-import org.moosetechnology.model.famixjava.famixtraits.*;
+import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.Class;
+import org.moosetechnology.model.famix.famixtraits.*;
import java.io.RandomAccessFile;
import java.util.ArrayList;
@@ -23,7 +23,7 @@ public class VisitorInvocRef extends AbstractRefVisitor {
/**
* Useful to keep the FamixType created in the specific case of "new SomeClass().someMethod()"
*/
- private final org.moosetechnology.model.famixjava.famixjavaentities.Type classInstanceCreated = null;
+ private final org.moosetechnology.model.famix.famixjavaentities.Type classInstanceCreated = null;
/**
* The source code of the visited AST.
@@ -265,7 +265,7 @@ public boolean visit(SuperMethodInvocation node) {
if (bnd == null) {
Iterator iter = ((TWithInheritances) this.context.topType()).getSuperInheritances().iterator();
- org.moosetechnology.model.famixjava.famixtraits.TType superClass = (TType) iter.next().getSuperclass();
+ org.moosetechnology.model.famix.famixtraits.TType superClass = (TType) iter.next().getSuperclass();
/* This code does not seem to do anything worthwhile
while ((superClass instanceof org.moosetechnology.model.famixjava.famixjavaentities.Class)
&& (((org.moosetechnology.model.famixjava.famixjavaentities.Class) superClass).getIsInterface())
@@ -578,7 +578,7 @@ private TNamedEntity getReceiver(Expression expr) {
* @param receiver -- the FAMIX Entity describing the receiver
* @return the Famix Entity or null if could not find it
*/
- private org.moosetechnology.model.famixjava.famixtraits.TType getInvokedMethodOwner(Expression expr, TNamedEntity receiver) {
+ private org.moosetechnology.model.famix.famixtraits.TType getInvokedMethodOwner(Expression expr, TNamedEntity receiver) {
// ((type)expr).msg()
if (NodeTypeChecker.isCastExpression(expr)) {
Type tcast = ((CastExpression) expr).getType();
@@ -636,8 +636,8 @@ else if ( NodeTypeChecker.isSuperMethodInvocation(expr)) {
}*/
else if (receiver instanceof TTypedEntity) {
return ((TTypedEntity) receiver).getDeclaredType();
- } else if (receiver instanceof org.moosetechnology.model.famixjava.famixjavaentities.Type) {
- return (org.moosetechnology.model.famixjava.famixjavaentities.Type) receiver;
+ } else if (receiver instanceof org.moosetechnology.model.famix.famixjavaentities.Type) {
+ return (org.moosetechnology.model.famix.famixjavaentities.Type) receiver;
}
// ... what else ?
else {
diff --git a/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorTypeRefRef.java b/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorTypeRefRef.java
index 2c8114db..f98d2a6d 100644
--- a/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorTypeRefRef.java
+++ b/src/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorTypeRefRef.java
@@ -3,13 +3,13 @@
import fr.inria.verveine.extractor.java.JavaDictionary;
import fr.inria.verveine.extractor.java.VerveineJOptions;
import org.eclipse.jdt.core.dom.*;
-import org.moosetechnology.model.famixjava.famixjavaentities.ContainerEntity;
-import org.moosetechnology.model.famixjava.famixjavaentities.Method;
-import org.moosetechnology.model.famixjava.famixjavaentities.Reference;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
-import org.moosetechnology.model.famixjava.famixtraits.TTypedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TWithTypes;
+import org.moosetechnology.model.famix.famixjavaentities.ContainerEntity;
+import org.moosetechnology.model.famix.famixjavaentities.Method;
+import org.moosetechnology.model.famix.famixjavaentities.Reference;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TType;
+import org.moosetechnology.model.famix.famixtraits.TTypedEntity;
+import org.moosetechnology.model.famix.famixtraits.TWithTypes;
import java.util.List;
@@ -65,7 +65,7 @@ public boolean visit(ClassInstanceCreation node) {
visitClassInstanceCreation(node);
if (node.getAnonymousClassDeclaration() == null) {
Type clazz = node.getType();
- org.moosetechnology.model.famixjava.famixtraits.TType fmx = referedType(clazz, (ContainerEntity) context.top(), true);
+ org.moosetechnology.model.famix.famixtraits.TType fmx = referedType(clazz, (ContainerEntity) context.top(), true);
Reference ref = null;
if (! summarizeClasses()) {
ref = dico.addFamixReference((Method) context.top(), fmx, context.getLastReference());
@@ -195,7 +195,7 @@ public void endVisit(Initializer node) {
}
public boolean visit(InstanceofExpression node) {
- org.moosetechnology.model.famixjava.famixtraits.TType fmx = null;
+ org.moosetechnology.model.famix.famixtraits.TType fmx = null;
Type clazz = node.getRightOperand();
fmx = referedType(clazz, (ContainerEntity) context.top(), true);
@@ -288,7 +288,7 @@ public boolean visit(SimpleName node) {
if (this.searchTypeRef) {
IBinding bnd = node.resolveBinding();
if ((bnd != null) && (bnd.getKind() == IBinding.TYPE)) {
- org.moosetechnology.model.famixjava.famixtraits.TType referred = (org.moosetechnology.model.famixjava.famixtraits.TType) referedType((ITypeBinding) bnd, (ContainerEntity) context.top(), !((ITypeBinding) bnd).isEnum());
+ org.moosetechnology.model.famix.famixtraits.TType referred = (org.moosetechnology.model.famix.famixtraits.TType) referedType((ITypeBinding) bnd, (ContainerEntity) context.top(), !((ITypeBinding) bnd).isEnum());
Reference ref = dico.addFamixReference((Method) context.top(), referred, context.getLastReference());
context.setLastReference(ref);
if ((options.withAnchors(VerveineJOptions.AnchorOptions.assoc)) && (ref != null) ) {
diff --git a/src/org/moosetechnology/model/famixjava/famixjavaentities/FamixJavaEntitiesModel.java b/src/org/moosetechnology/model/famixjava/famixjavaentities/FamixJavaEntitiesModel.java
deleted file mode 100644
index 96bfd76d..00000000
--- a/src/org/moosetechnology/model/famixjava/famixjavaentities/FamixJavaEntitiesModel.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixjavaentities;
-
-import ch.akuhn.fame.MetaRepository;
-
-public class FamixJavaEntitiesModel {
-
- public static MetaRepository metamodel() {
- MetaRepository metamodel = new MetaRepository();
- importInto(metamodel);
- return metamodel;
- }
-
- public static void importInto(MetaRepository metamodel) {
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Access.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.AnnotationInstance.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.AnnotationInstanceAttribute.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.AnnotationType.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.AnnotationTypeAttribute.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Attribute.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Class.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Comment.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.ContainerEntity.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Entity.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Enum.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.EnumValue.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Exception.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.FamixJavaModel.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.File.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Folder.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Implementation.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.ImplicitVariable.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.IndexedFileAnchor.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Inheritance.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Interface.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Invocation.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.LocalVariable.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Method.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.NamedEntity.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Package.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Parameter.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.ParameterType.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.ParameterizableClass.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.ParameterizableInterface.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.ParameterizedType.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.PrimitiveType.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Reference.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.SourceAnchor.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.SourceLanguage.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.SourceTextAnchor.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.SourcedEntity.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.TCanBeSynchronized.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.TCanBeTransient.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.TCanBeVolatile.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.TClassMetrics.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.TWithInterfaces.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.Type.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.UnknownSourceLanguage.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixjavaentities.UnknownVariable.class);
-
- }
-
-}
-
diff --git a/src/org/moosetechnology/model/famixjava/famixtraits/FamixTraitsModel.java b/src/org/moosetechnology/model/famixjava/famixtraits/FamixTraitsModel.java
deleted file mode 100644
index 7e0f8922..00000000
--- a/src/org/moosetechnology/model/famixjava/famixtraits/FamixTraitsModel.java
+++ /dev/null
@@ -1,145 +0,0 @@
-// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.famixtraits;
-
-import ch.akuhn.fame.MetaRepository;
-
-public class FamixTraitsModel {
-
- public static MetaRepository metamodel() {
- MetaRepository metamodel = new MetaRepository();
- importInto(metamodel);
- return metamodel;
- }
-
- public static void importInto(MetaRepository metamodel) {
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.AnnotationInstanceGroup.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.AnnotationTypeGroup.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.ClassGroup.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.FamixModel.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.FileGroup.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.FolderGroup.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.GlobalVariableGroup.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.InvocationGroup.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.MethodGroup.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.NamespaceGroup.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.PackageGroup.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TAccess.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TAccessible.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TAnnotationInstance.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TAnnotationInstanceAttribute.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TAnnotationType.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TAnnotationTypeAttribute.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TAssociation.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TAttribute.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TCanBeAbstract.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TCanBeClassSide.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TCanBeFinal.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TCanImplement.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TClass.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TClassHierarchyNavigation.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TClassMetrics.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TClassWithVisibility.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TCohesionCouplingMetrics.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TComment.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TCompilationUnit.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TDefinedInModule.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TDereferencedInvocation.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TEnum.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TEnumValue.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TException.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TFile.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TFileAnchor.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TFileInclude.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TFileNavigation.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TFileSystemEntity.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TFolder.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TFunction.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TGlobalVariable.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.THasImmediateSource.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.THasKind.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.THasModifiers.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.THasSignature.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.THasVisibility.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.THeader.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TImplementable.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TImplementation.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TImplicitVariable.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TIndexedFileNavigation.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TInheritance.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TInvocable.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TInvocation.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TInvocationsReceiver.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TLCOMMetrics.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TLocalVariable.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TMethod.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TMethodMetrics.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TModule.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TMultipleFileAnchor.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TNamedEntity.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TNamespace.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TPackage.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TPackageable.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TParameter.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TParameterType.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TParameterizedType.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TParameterizedTypeUser.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TPreprocessorDefine.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TPreprocessorIfdef.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TPrimitiveType.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TReference.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TReferenceable.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TRelativeSourceAnchor.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TSourceAnchor.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TSourceEntity.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TSourceLanguage.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TStructuralEntity.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TTemplate.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TTemplateUser.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TTrait.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TTraitUsage.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TTraitUser.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TType.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TTypeAlias.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TTypedAnnotationInstance.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TTypedAnnotationInstanceAttribute.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TTypedEntity.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TUnknownSourceLanguage.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TUnknownVariable.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithAccesses.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithAnnotationInstanceAttributes.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithAnnotationInstances.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithAnnotationTypes.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithAttributes.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithClasses.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithComments.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithCompilationUnits.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithDereferencedInvocations.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithEnumValues.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithExceptions.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithFileIncludes.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithFiles.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithFunctions.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithGlobalVariables.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithHeaders.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithImplicitVariables.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithInheritances.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithInvocations.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithLocalVariables.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithMethods.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithPackages.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithParameterizedTypeUsers.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithParameterizedTypes.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithParameters.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithReferences.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithSourceLanguages.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithStatements.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithTemplates.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithTraits.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithTypeAliases.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TWithTypes.class);
- metamodel.with(org.moosetechnology.model.famixjava.famixtraits.TypeGroup.class);
-
- }
-
-}
-
diff --git a/src/org/moosetechnology/model/famixjava/moose/MooseModel.java b/src/org/moosetechnology/model/famixjava/moose/MooseModel.java
deleted file mode 100644
index 9123349b..00000000
--- a/src/org/moosetechnology/model/famixjava/moose/MooseModel.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.moose;
-
-import ch.akuhn.fame.MetaRepository;
-
-public class MooseModel {
-
- public static MetaRepository metamodel() {
- MetaRepository metamodel = new MetaRepository();
- importInto(metamodel);
- return metamodel;
- }
-
- public static void importInto(MetaRepository metamodel) {
- metamodel.with(org.moosetechnology.model.famixjava.moose.AbstractGroup.class);
- metamodel.with(org.moosetechnology.model.famixjava.moose.Entity.class);
- metamodel.with(org.moosetechnology.model.famixjava.moose.Group.class);
- metamodel.with(org.moosetechnology.model.famixjava.moose.Model.class);
- metamodel.with(org.moosetechnology.model.famixjava.moose.Object.class);
- metamodel.with(org.moosetechnology.model.famixjava.moose.PropertyGroup.class);
- metamodel.with(org.moosetechnology.model.famixjava.moose.SpecializedGroup.class);
-
- }
-
-}
-
diff --git a/src/org/moosetechnology/model/famixjava/tagging/TaggingModel.java b/src/org/moosetechnology/model/famixjava/tagging/TaggingModel.java
deleted file mode 100644
index d934f2c5..00000000
--- a/src/org/moosetechnology/model/famixjava/tagging/TaggingModel.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// Automagically generated code, please do not change
-package org.moosetechnology.model.famixjava.tagging;
-
-import ch.akuhn.fame.MetaRepository;
-
-public class TaggingModel {
-
- public static MetaRepository metamodel() {
- MetaRepository metamodel = new MetaRepository();
- importInto(metamodel);
- return metamodel;
- }
-
- public static void importInto(MetaRepository metamodel) {
- metamodel.with(org.moosetechnology.model.famixjava.tagging.Association.class);
- metamodel.with(org.moosetechnology.model.famixjava.tagging.Category.class);
- metamodel.with(org.moosetechnology.model.famixjava.tagging.EntityAssociation.class);
- metamodel.with(org.moosetechnology.model.famixjava.tagging.IntervalAssociation.class);
- metamodel.with(org.moosetechnology.model.famixjava.tagging.Tag.class);
- metamodel.with(org.moosetechnology.model.famixjava.tagging.TagModel.class);
-
- }
-
-}
-
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_AdHoc.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_AdHoc.java
index 54fbce34..06ed989b 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_AdHoc.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_AdHoc.java
@@ -7,10 +7,10 @@
import fr.inria.verveine.extractor.java.utils.Util;
import org.junit.Before;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.Enum;
-import org.moosetechnology.model.famixjava.famixjavaentities.Package;
-import org.moosetechnology.model.famixjava.famixjavaentities.*;
-import org.moosetechnology.model.famixjava.famixtraits.*;
+import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.Enum;
+import org.moosetechnology.model.famix.famixjavaentities.Package;
+import org.moosetechnology.model.famix.famixtraits.*;
import java.io.File;
import java.lang.Exception;
@@ -134,7 +134,7 @@ public void testConstructorInvocations() {
}
// get calling method in InvokWithFullPath
- org.moosetechnology.model.famixjava.famixjavaentities.Class clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "InvokWithFullPath");
+ org.moosetechnology.model.famix.famixjavaentities.Class clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "InvokWithFullPath");
meth = (Method) firstElt(clazz.getMethods());
// get called method in InvokWithFullPath
@@ -148,11 +148,11 @@ public void testConstructorInvocations() {
public void testDeclaredTypeOfExternalEnum() {
parse(new String[] {"test_src/ad_hoc/ExternalEnum.java", "test_src/ad_hoc/AClassThatUseExternalEnum.java"});
- org.moosetechnology.model.famixjava.famixjavaentities.Class aClass = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "AClassThatUseExternalEnum");
+ org.moosetechnology.model.famix.famixjavaentities.Class aClass = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "AClassThatUseExternalEnum");
assertNotNull(aClass);
- org.moosetechnology.model.famixjava.famixjavaentities.Enum externalEnum = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Enum.class, "ExternalEnum");
+ org.moosetechnology.model.famix.famixjavaentities.Enum externalEnum = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Enum.class, "ExternalEnum");
assertNotNull(externalEnum);
assertEquals("ExternalEnum", externalEnum.getName());
@@ -169,7 +169,7 @@ public void testDeclaredTypeOfExternalEnum() {
public void testStubConstructor() {
parse(new String[]{"test_src/ad_hoc/DefaultConstructor.java"});
- org.moosetechnology.model.famixjava.famixjavaentities.Class stubClass = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "JFrame");
+ org.moosetechnology.model.famix.famixjavaentities.Class stubClass = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "JFrame");
assertNotNull(stubClass);
// test outgoing invocation to constructor
@@ -256,7 +256,7 @@ public void testUnknownMethod() {
public void testClassWithNoBindingButCanBeIdentifiedAsExceptionImportedAsException() {
parse(new String[]{"test_src/ad_hoc/Example.java"});
- org.moosetechnology.model.famixjava.famixjavaentities.Exception clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Exception.class, "BackingStoreException");
+ org.moosetechnology.model.famix.famixjavaentities.Exception clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Exception.class, "BackingStoreException");
assertNotNull(clazz);
}
@@ -298,7 +298,7 @@ public void testClassVar() {
public void testArrayListMatthias() {
parse(new String[]{"test_src/ad_hoc/Bla.java"});
- assertEquals(7, entitiesOfType(org.moosetechnology.model.famixjava.famixjavaentities.Class.class).size()); // Bla, Object, String, List, ArrayList, Arrays,Comparable,Serializable,CharSequence, AbstractList, AbstractCollection, Collection, Cloneable, RandomAccess, Iterable, ConstantDesc, Constable
+ assertEquals(7, entitiesOfType(org.moosetechnology.model.famix.famixjavaentities.Class.class).size()); // Bla, Object, String, List, ArrayList, Arrays,Comparable,Serializable,CharSequence, AbstractList, AbstractCollection, Collection, Cloneable, RandomAccess, Iterable, ConstantDesc, Constable
assertEquals(3, entitiesOfType(ParameterizableClass.class).size());
// compute all interfaces used by the 3 types String, ArrayList, Arrays
@@ -365,15 +365,15 @@ public void testMethodReturnArgumentTypes() {
public void testEnumDecl() {
parse(new String[]{"test_src/ad_hoc/Card.java", "test_src/ad_hoc/Planet.java"});
- org.moosetechnology.model.famixjava.famixjavaentities.Class javaLangEnum = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Enum");
+ org.moosetechnology.model.famix.famixjavaentities.Class javaLangEnum = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "Enum");
assertNotNull(javaLangEnum);
assertEquals("lang", Util.getOwner(javaLangEnum).getName());
assertEquals(ParameterizableClass.class, javaLangEnum.getClass());
- org.moosetechnology.model.famixjava.famixjavaentities.Class card = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Card");
+ org.moosetechnology.model.famix.famixjavaentities.Class card = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "Card");
assertNotNull(card);
- org.moosetechnology.model.famixjava.famixjavaentities.Enum rk = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Enum.class, "Rank");
+ org.moosetechnology.model.famix.famixjavaentities.Enum rk = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Enum.class, "Rank");
assertNotNull(rk);
assertEquals("Rank", rk.getName());
assertEquals(13, rk.getEnumValues().size());
@@ -389,7 +389,7 @@ public void testEnumDecl() {
assertEquals("NINE", nine.getName());
assertSame(rk, nine.getParentEnum());
- org.moosetechnology.model.famixjava.famixjavaentities.Enum st = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Enum.class, "Suit");
+ org.moosetechnology.model.famix.famixjavaentities.Enum st = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Enum.class, "Suit");
assertNotNull(st);
assertEquals("Suit", st.getName());
assertEquals(1, st.getSuperInheritances().size());
@@ -416,7 +416,7 @@ public void testEnumDecl() {
}
}
- org.moosetechnology.model.famixjava.famixjavaentities.Enum pl = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Enum.class, "Planet");
+ org.moosetechnology.model.famix.famixjavaentities.Enum pl = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Enum.class, "Planet");
assertNotNull(pl);
assertEquals("Planet", pl.getName());
assertEquals(1, pl.getSuperInheritances().size());
@@ -448,7 +448,7 @@ public void testEnumAccess() {
}
assertTrue("Did not find CUBS EnumValue in Suit Enum", foundClubs);
- org.moosetechnology.model.famixjava.famixjavaentities.Enum pl = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Enum.class, "Planet");
+ org.moosetechnology.model.famix.famixjavaentities.Enum pl = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Enum.class, "Planet");
assertNotNull(pl);
assertEquals(8, pl.getEnumValues().size());
@@ -587,7 +587,7 @@ public void testWrongMethodOwner() {
Method meth = detectFamixElement(Method.class, "methodWrongOwner");
assertNotNull(meth);
- assertEquals(detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "SuperWrongOwner"), meth.getParentType());
+ assertEquals(detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "SuperWrongOwner"), meth.getParentType());
}
@Test
@@ -608,7 +608,7 @@ public void testModifiers() {
public void testMultipleSignatures() {
parse(new String[]{"test_src/ad_hoc/MultipleSignatures.java"});
- org.moosetechnology.model.famixjava.famixjavaentities.Exception throwable = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Exception.class, "Throwable");
+ org.moosetechnology.model.famix.famixjavaentities.Exception throwable = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Exception.class, "Throwable");
assertNotNull(throwable);
assertEquals(2, throwable.getMethods().size()); // printStackTrace() & printStackTrace(PrintWriter)
@@ -669,7 +669,7 @@ public void testInstanceOf() {
public void testPublicStaticInnerClass() {
parse(new String[]{"test_src/ad_hoc/StaticInnerClass.java"});
- org.moosetechnology.model.famixjava.famixjavaentities.Class clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "ThisIsTheStaticInnerClass");
+ org.moosetechnology.model.famix.famixjavaentities.Class clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "ThisIsTheStaticInnerClass");
assertNotNull(clazz);
assertTrue(clazz.getIsPublic());
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Basic.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Basic.java
index 4c09da1c..058f196e 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Basic.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Basic.java
@@ -4,16 +4,14 @@
import fr.inria.verveine.extractor.java.utils.Util;
import org.junit.Assume;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.Package;
-import org.moosetechnology.model.famixjava.famixjavaentities.*;
-import org.moosetechnology.model.famixjava.famixjavaentities.Exception;
-import org.moosetechnology.model.famixjava.famixtraits.TAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TStructuralEntity;
+import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.Package;
+import org.moosetechnology.model.famix.famixtraits.TAttribute;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixtraits.TStructuralEntity;
import java.lang.Class;
-import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -22,7 +20,6 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import java.util.Vector;
import java.util.stream.Stream;
@@ -183,7 +180,7 @@ public void testMethodAndClassSourceAnchor() {
for ( Method m : repo.all(Method.class)) {
Type parent = (Type) m.getParentType();
if ((parent != null) &&
- (!(parent instanceof org.moosetechnology.model.famixjava.famixjavaentities.Enum)) && // for enums some methods are implicit
+ (!(parent instanceof org.moosetechnology.model.famix.famixjavaentities.Enum)) && // for enums some methods are implicit
(!m.getName().equals(parent.getName())) && // for constructors are implicit
(!m.getName().equals(JavaDictionary.INIT_BLOCK_NAME)) &&
(parent.getSourceAnchor() != null)) {
@@ -219,7 +216,7 @@ public void testJavaCore() {
*/
// Object
- org.moosetechnology.model.famixjava.famixjavaentities.Class obj = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, JavaDictionary.OBJECT_NAME);
+ org.moosetechnology.model.famix.famixjavaentities.Class obj = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, JavaDictionary.OBJECT_NAME);
assertNotNull(obj);
assertSame(javaLang, obj.getTypeContainer());
assertEquals(0, obj.getSuperInheritances().size());
@@ -241,7 +238,7 @@ public void testJavaCore() {
assertEquals(0, serial.getSuperInheritances().size());
*/
- org.moosetechnology.model.famixjava.famixjavaentities.Class str = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "String");
+ org.moosetechnology.model.famix.famixjavaentities.Class str = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "String");
assertNotNull(str);
assertSame(javaLang, str.getTypeContainer());
/*stubs no longer have inheritance
@@ -260,7 +257,7 @@ public void testJavaCore() {
public void testSystemClass() {
Assume.assumeTrue(testsToRun[4]);
- org.moosetechnology.model.famixjava.famixjavaentities.Class syst = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "System");
+ org.moosetechnology.model.famix.famixjavaentities.Class syst = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "System");
assertNotNull(syst);
String javaLangName = JavaDictionary.OBJECT_PACKAGE_NAME.substring(JavaDictionary.OBJECT_PACKAGE_NAME.lastIndexOf('.') + 1);
Package javaLang = detectFamixElement(Package.class, javaLangName);
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_ClassRef.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_ClassRef.java
index e7574183..f2b6839d 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_ClassRef.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_ClassRef.java
@@ -3,9 +3,7 @@
import org.junit.Before;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.Access;
-import org.moosetechnology.model.famixjava.famixjavaentities.Class;
-import org.moosetechnology.model.famixjava.famixjavaentities.Reference;
+import org.moosetechnology.model.famix.famixjavaentities.Reference;
import java.io.File;
import java.util.Collection;
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_CommentsMethod.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_CommentsMethod.java
index b9a1b1ef..66f901a7 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_CommentsMethod.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_CommentsMethod.java
@@ -3,8 +3,8 @@
import org.junit.Before;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.IndexedFileAnchor;
-import org.moosetechnology.model.famixjava.famixjavaentities.Method;
+import org.moosetechnology.model.famix.famixjavaentities.IndexedFileAnchor;
+import org.moosetechnology.model.famix.famixjavaentities.Method;
import java.io.File;
import java.util.ArrayList;
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Configuration.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Configuration.java
index 1259d6bb..08003f7b 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Configuration.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Configuration.java
@@ -2,10 +2,10 @@
import org.junit.Before;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.Class;
-import org.moosetechnology.model.famixjava.famixjavaentities.*;
-import org.moosetechnology.model.famixjava.famixtraits.TAccess;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.Class;
+import org.moosetechnology.model.famix.famixtraits.TAccess;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
import java.io.File;
import java.io.FileReader;
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Exceptions.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Exceptions.java
index 26d5fceb..eea2706f 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Exceptions.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Exceptions.java
@@ -2,8 +2,7 @@
import org.junit.Before;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.Method;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixjavaentities.Method;
import java.io.File;
@@ -32,11 +31,11 @@ public void testDeclaredExceptions() {
Method meth = detectFamixElement( Method.class, "lire");
assertNotNull(meth);
- org.moosetechnology.model.famixjava.famixjavaentities.Exception excepClass = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Exception.class, "ReadException");
+ org.moosetechnology.model.famix.famixjavaentities.Exception excepClass = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Exception.class, "ReadException");
assertNotNull(excepClass);
assertEquals(1, meth.getDeclaredExceptions().size());
- org.moosetechnology.model.famixjava.famixjavaentities.Exception exD = (org.moosetechnology.model.famixjava.famixjavaentities.Exception) firstElt(meth.getDeclaredExceptions());
+ org.moosetechnology.model.famix.famixjavaentities.Exception exD = (org.moosetechnology.model.famix.famixjavaentities.Exception) firstElt(meth.getDeclaredExceptions());
assertSame(meth, firstElt(exD.getDeclaringEntities()));
assertSame(excepClass, exD);
}
@@ -47,10 +46,10 @@ public void testThrownExceptions() {
assertNotNull(meth);
assertEquals(1, meth.getThrownExceptions().size());
- org.moosetechnology.model.famixjava.famixjavaentities.Exception exT = (org.moosetechnology.model.famixjava.famixjavaentities.Exception) firstElt(meth.getThrownExceptions());
+ org.moosetechnology.model.famix.famixjavaentities.Exception exT = (org.moosetechnology.model.famix.famixjavaentities.Exception) firstElt(meth.getThrownExceptions());
assertSame(meth, firstElt(exT.getThrowingEntities()));
- org.moosetechnology.model.famixjava.famixjavaentities.Exception excepClass = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Exception.class, "ReadException");
+ org.moosetechnology.model.famix.famixjavaentities.Exception excepClass = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Exception.class, "ReadException");
assertSame(excepClass, exT);
}
@@ -60,10 +59,10 @@ public void testCaughtExceptions() {
assertNotNull(meth);
assertEquals(1,meth.getCaughtExceptions().size());
- org.moosetechnology.model.famixjava.famixjavaentities.Exception exC = (org.moosetechnology.model.famixjava.famixjavaentities.Exception) firstElt(meth.getCaughtExceptions());
+ org.moosetechnology.model.famix.famixjavaentities.Exception exC = (org.moosetechnology.model.famix.famixjavaentities.Exception) firstElt(meth.getCaughtExceptions());
assertSame(meth, firstElt(exC.getCatchingEntities()));
- org.moosetechnology.model.famixjava.famixjavaentities.Exception excepClass = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Exception.class, "IOException");
+ org.moosetechnology.model.famix.famixjavaentities.Exception excepClass = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Exception.class, "IOException");
assertSame(excepClass, exC);
}
@@ -74,17 +73,17 @@ public void testGenericExceptions() {
// assertEquals(0, meth.getParentType().getTypes().size());
assertEquals(1, meth.getDeclaredExceptions().size());
- org.moosetechnology.model.famixjava.famixjavaentities.Exception exD = (org.moosetechnology.model.famixjava.famixjavaentities.Exception) firstElt(meth.getDeclaredExceptions());
+ org.moosetechnology.model.famix.famixjavaentities.Exception exD = (org.moosetechnology.model.famix.famixjavaentities.Exception) firstElt(meth.getDeclaredExceptions());
assertSame(meth, firstElt(exD.getDeclaringEntities()));
assertEquals("T", exD.getName());
}
@Test
public void testExceptionCanHaveInnerEnumerationExceptions() {
- org.moosetechnology.model.famixjava.famixjavaentities.Enum typeEnum = detectFamixElement( org.moosetechnology.model.famixjava.famixjavaentities.Enum.class, "Type");
+ org.moosetechnology.model.famix.famixjavaentities.Enum typeEnum = detectFamixElement( org.moosetechnology.model.famix.famixjavaentities.Enum.class, "Type");
assertNotNull(typeEnum);
- org.moosetechnology.model.famixjava.famixjavaentities.Exception localException = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Exception.class, "LocalException");
+ org.moosetechnology.model.famix.famixjavaentities.Exception localException = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Exception.class, "LocalException");
assertNotNull(localException);
}
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Generics.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Generics.java
index e5c2df78..caa4d321 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Generics.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Generics.java
@@ -12,18 +12,18 @@
import org.junit.Before;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.ContainerEntity;
-import org.moosetechnology.model.famixjava.famixjavaentities.Method;
-import org.moosetechnology.model.famixjava.famixjavaentities.Parameter;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterType;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterizableClass;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterizableInterface;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterizedType;
-import org.moosetechnology.model.famixjava.famixjavaentities.Type;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TParameter;
-import org.moosetechnology.model.famixjava.famixtraits.TParameterizedType;
-import org.moosetechnology.model.famixjava.famixtraits.TType;
+import org.moosetechnology.model.famix.famixjavaentities.ContainerEntity;
+import org.moosetechnology.model.famix.famixjavaentities.Method;
+import org.moosetechnology.model.famix.famixjavaentities.Parameter;
+import org.moosetechnology.model.famix.famixjavaentities.ParameterType;
+import org.moosetechnology.model.famix.famixjavaentities.ParameterizableClass;
+import org.moosetechnology.model.famix.famixjavaentities.ParameterizableInterface;
+import org.moosetechnology.model.famix.famixjavaentities.ParameterizedType;
+import org.moosetechnology.model.famix.famixjavaentities.Type;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TParameter;
+import org.moosetechnology.model.famix.famixtraits.TParameterizedType;
+import org.moosetechnology.model.famix.famixtraits.TType;
public class VerveineJTest_Generics extends VerveineJTest_Basic {
@@ -111,7 +111,7 @@ public void testParameterizedType() {
assertNotNull(refedArrList);
assertEquals("ArrayList", refedArrList.getName());
- org.moosetechnology.model.famixjava.famixjavaentities.Class arrList = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "ArrayList");
+ org.moosetechnology.model.famix.famixjavaentities.Class arrList = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "ArrayList");
assertNotNull(arrList);
assertEquals(arrList, refedArrList.getParameterizableClass());
assertEquals(arrList.getContainer(), refedArrList.getContainer());
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_ImplicitVarBinding.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_ImplicitVarBinding.java
index 3b6cb656..144621e6 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_ImplicitVarBinding.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_ImplicitVarBinding.java
@@ -3,9 +3,9 @@
import fr.inria.verveine.extractor.java.utils.ImplicitVarBinding;
import org.junit.Before;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.ImplicitVariable;
-import org.moosetechnology.model.famixjava.famixjavaentities.Method;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixjavaentities.ImplicitVariable;
+import org.moosetechnology.model.famix.famixjavaentities.Method;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
import java.util.Collection;
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Inner.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Inner.java
index 6cea2e44..aa24b462 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Inner.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Inner.java
@@ -3,12 +3,10 @@
import org.junit.Before;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.Class;
-import org.moosetechnology.model.famixjava.famixjavaentities.Interface;
-import org.moosetechnology.model.famixjava.famixjavaentities.Invocation;
-import org.moosetechnology.model.famixjava.famixjavaentities.NamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocation;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixjavaentities.Class;
+import org.moosetechnology.model.famix.famixjavaentities.Interface;
+import org.moosetechnology.model.famix.famixjavaentities.Invocation;
+import org.moosetechnology.model.famix.famixjavaentities.NamedEntity;
import java.io.File;
import java.util.Collection;
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_JWSBasic.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_JWSBasic.java
index f004cd56..496f98b2 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_JWSBasic.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_JWSBasic.java
@@ -6,11 +6,11 @@
import org.junit.Before;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.Package;
-import org.moosetechnology.model.famixjava.famixjavaentities.*;
-import org.moosetechnology.model.famixjava.famixtraits.TAnnotationInstance;
-import org.moosetechnology.model.famixjava.famixtraits.TAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixjavaentities.Package;
+import org.moosetechnology.model.famix.famixtraits.TAnnotationInstance;
+import org.moosetechnology.model.famix.famixtraits.TAttribute;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
import java.io.File;
import java.lang.Exception;
@@ -62,7 +62,7 @@ public void testAnnotation() {
}
// Class annotation
- org.moosetechnology.model.famixjava.famixjavaentities.Class cl = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "SimpleBean");
+ org.moosetechnology.model.famix.famixjavaentities.Class cl = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "SimpleBean");
assertNotNull(cl);
assertEquals(2, cl.getAnnotationInstances().size());
for (TAnnotationInstance a : cl.getAnnotationInstances()) {
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Lambdas.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Lambdas.java
index 911d24d5..1fa63fc3 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Lambdas.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Lambdas.java
@@ -2,10 +2,10 @@
import org.junit.Before;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.Access;
-import org.moosetechnology.model.famixjava.famixjavaentities.LocalVariable;
-import org.moosetechnology.model.famixjava.famixjavaentities.Method;
-import org.moosetechnology.model.famixjava.famixtraits.TLocalVariable;
+import org.moosetechnology.model.famix.famixjavaentities.Access;
+import org.moosetechnology.model.famix.famixjavaentities.LocalVariable;
+import org.moosetechnology.model.famix.famixjavaentities.Method;
+import org.moosetechnology.model.famix.famixtraits.TLocalVariable;
import java.io.File;
import java.util.Collection;
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_LanModel.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_LanModel.java
index b15b2c98..e61533cb 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_LanModel.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_LanModel.java
@@ -18,36 +18,36 @@
import org.junit.Before;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.Access;
-import org.moosetechnology.model.famixjava.famixjavaentities.AnnotationInstance;
-import org.moosetechnology.model.famixjava.famixjavaentities.AnnotationType;
-import org.moosetechnology.model.famixjava.famixjavaentities.Attribute;
-import org.moosetechnology.model.famixjava.famixjavaentities.Comment;
-import org.moosetechnology.model.famixjava.famixjavaentities.Implementation;
-import org.moosetechnology.model.famixjava.famixjavaentities.ImplicitVariable;
-import org.moosetechnology.model.famixjava.famixjavaentities.IndexedFileAnchor;
-import org.moosetechnology.model.famixjava.famixjavaentities.Inheritance;
-import org.moosetechnology.model.famixjava.famixjavaentities.Interface;
-import org.moosetechnology.model.famixjava.famixjavaentities.Invocation;
-import org.moosetechnology.model.famixjava.famixjavaentities.LocalVariable;
-import org.moosetechnology.model.famixjava.famixjavaentities.Method;
-import org.moosetechnology.model.famixjava.famixjavaentities.Package;
-import org.moosetechnology.model.famixjava.famixjavaentities.Parameter;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterizableClass;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterizableInterface;
-import org.moosetechnology.model.famixjava.famixjavaentities.PrimitiveType;
-import org.moosetechnology.model.famixjava.famixjavaentities.SourceAnchor;
-import org.moosetechnology.model.famixjava.famixtraits.TAccess;
-import org.moosetechnology.model.famixjava.famixtraits.TAnnotationInstance;
-import org.moosetechnology.model.famixjava.famixtraits.TAttribute;
-import org.moosetechnology.model.famixjava.famixtraits.TComment;
-import org.moosetechnology.model.famixjava.famixtraits.TImplementation;
-import org.moosetechnology.model.famixjava.famixtraits.TInheritance;
-import org.moosetechnology.model.famixjava.famixtraits.TInvocation;
-import org.moosetechnology.model.famixjava.famixtraits.TMethod;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
-import org.moosetechnology.model.famixjava.famixtraits.TParameter;
-import org.moosetechnology.model.famixjava.famixtraits.TSourceEntity;
+import org.moosetechnology.model.famix.famixjavaentities.Access;
+import org.moosetechnology.model.famix.famixjavaentities.AnnotationInstance;
+import org.moosetechnology.model.famix.famixjavaentities.AnnotationType;
+import org.moosetechnology.model.famix.famixjavaentities.Attribute;
+import org.moosetechnology.model.famix.famixjavaentities.Comment;
+import org.moosetechnology.model.famix.famixjavaentities.Implementation;
+import org.moosetechnology.model.famix.famixjavaentities.ImplicitVariable;
+import org.moosetechnology.model.famix.famixjavaentities.IndexedFileAnchor;
+import org.moosetechnology.model.famix.famixjavaentities.Inheritance;
+import org.moosetechnology.model.famix.famixjavaentities.Interface;
+import org.moosetechnology.model.famix.famixjavaentities.Invocation;
+import org.moosetechnology.model.famix.famixjavaentities.LocalVariable;
+import org.moosetechnology.model.famix.famixjavaentities.Method;
+import org.moosetechnology.model.famix.famixjavaentities.Package;
+import org.moosetechnology.model.famix.famixjavaentities.Parameter;
+import org.moosetechnology.model.famix.famixjavaentities.ParameterizableClass;
+import org.moosetechnology.model.famix.famixjavaentities.ParameterizableInterface;
+import org.moosetechnology.model.famix.famixjavaentities.PrimitiveType;
+import org.moosetechnology.model.famix.famixjavaentities.SourceAnchor;
+import org.moosetechnology.model.famix.famixtraits.TAccess;
+import org.moosetechnology.model.famix.famixtraits.TAnnotationInstance;
+import org.moosetechnology.model.famix.famixtraits.TAttribute;
+import org.moosetechnology.model.famix.famixtraits.TComment;
+import org.moosetechnology.model.famix.famixtraits.TImplementation;
+import org.moosetechnology.model.famix.famixtraits.TInheritance;
+import org.moosetechnology.model.famix.famixtraits.TInvocation;
+import org.moosetechnology.model.famix.famixtraits.TMethod;
+import org.moosetechnology.model.famix.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixtraits.TParameter;
+import org.moosetechnology.model.famix.famixtraits.TSourceEntity;
/**
* @author Nicolas Anquetil
@@ -121,7 +121,7 @@ public void testEntitiesNumber() {
Collection> lanModelJavaClasses = allJavaSuperClasses(LAN_MODEL_JAVA_CLASSES_USED);
assertEquals(
lanModelJavaClasses.size() + 10, // FileServer, Node, AbstractDestinationAddress, WorkStation, XPrinter, Packet, PrintServer, SingleDestinationAddress, OutputServer, _Anonymous(IPrinter)
- entitiesOfType(org.moosetechnology.model.famixjava.famixjavaentities.Class.class).size());
+ entitiesOfType(org.moosetechnology.model.famix.famixjavaentities.Class.class).size());
assertEquals(
allInterfacesFromClasses(LAN_MODEL_JAVA_CLASSES_USED).size() + 1, // add IPrinter
@@ -152,13 +152,13 @@ public void testEntitiesNumber() {
@Test
public void testClassProperties() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class clazz;
+ org.moosetechnology.model.famix.famixjavaentities.Class clazz;
Package pckg = detectFamixElement(Package.class, "lan");
assertNotNull(pckg);
assertEquals("lan", pckg.getName());
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Node");
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "Node");
assertNotNull(clazz);
assertEquals("Node", clazz.getName());
assertEquals(11, clazz.numberOfMethods());
@@ -166,7 +166,7 @@ public void testClassProperties() {
assertSame(pckg, clazz.getTypeContainer());
assertFalse(clazz.getIsInterface());
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class,
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class,
"SingleDestinationAddress");
assertNotNull(clazz);
assertEquals("SingleDestinationAddress", clazz.getName());
@@ -175,8 +175,8 @@ public void testClassProperties() {
assertSame(pckg, clazz.getTypeContainer());
assertFalse(clazz.getIsInterface());
- org.moosetechnology.model.famixjava.famixjavaentities.Class outputServ = detectFamixElement(
- org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "OutputServer");
+ org.moosetechnology.model.famix.famixjavaentities.Class outputServ = detectFamixElement(
+ org.moosetechnology.model.famix.famixjavaentities.Class.class, "OutputServer");
assertNotNull(outputServ);
assertEquals("OutputServer", outputServ.getName());
assertEquals(4, outputServ.getMethods().size());
@@ -200,20 +200,20 @@ public void testClassProperties() {
assertEquals(0, interfacePrinter.numberOfAttributes());
assertSame(pckg, interfacePrinter.getTypeContainer());
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "XPrinter");
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "XPrinter");
assertNotNull(clazz);
assertEquals("XPrinter", clazz.getName());
assertEquals(2, clazz.numberOfMethods());
assertEquals(1, clazz.numberOfAttributes());
- assertSame(detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "PrintServer"),
+ assertSame(detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "PrintServer"),
clazz.getTypeContainer());
assertFalse(clazz.getIsInterface());
}
@Test
public void testAnonymous() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class clazz = detectFamixElement(
- org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "_Anonymous(IPrinter)");
+ org.moosetechnology.model.famix.famixjavaentities.Class clazz = detectFamixElement(
+ org.moosetechnology.model.famix.famixjavaentities.Class.class, "_Anonymous(IPrinter)");
assertNotNull(clazz);
assertEquals("_Anonymous(IPrinter)", clazz.getName());
assertEquals(2, clazz.numberOfMethods()); // the method print and the stub constructor
@@ -261,45 +261,45 @@ public void testNamedEntities() {
assertSame(javaLang, javaDictionary.ensureFamixPackageJavaLang(null));
assertTrue(javaLang.getIsStub());
- org.moosetechnology.model.famixjava.famixjavaentities.Class obj = javaDictionary.ensureFamixClassObject(null);
+ org.moosetechnology.model.famix.famixjavaentities.Class obj = javaDictionary.ensureFamixClassObject(null);
assertEquals(JavaDictionary.OBJECT_NAME, obj.getName());
assertSame(obj, javaDictionary.ensureFamixClassObject(null));
assertEquals(0, obj.getSuperInheritances().size());
assertSame(javaLang, obj.getTypeContainer());
- org.moosetechnology.model.famixjava.famixjavaentities.Class fmx = javaDictionary.ensureFamixClassStubOwner();
+ org.moosetechnology.model.famix.famixjavaentities.Class fmx = javaDictionary.ensureFamixClassStubOwner();
assertEquals(JavaDictionary.STUB_METHOD_CONTAINER_NAME, fmx.getName());
assertSame(fmx, javaDictionary.ensureFamixClassStubOwner());
}
@Test
public void testInheritance() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class clazz;
+ org.moosetechnology.model.famix.famixjavaentities.Class clazz;
Collection superInheritances;
Inheritance inh = null;
Collection inherits;
Collection implementations;
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "PrintServer");
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "PrintServer");
assertNotNull(clazz);
superInheritances = clazz.getSuperInheritances();
assertEquals(1, superInheritances.size());
inh = (Inheritance) firstElt(superInheritances);
assertSame(clazz, inh.getSubclass());
assertSame(
- detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "OutputServer"),
+ detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "OutputServer"),
inh.getSuperclass());
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Node");
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "Node");
assertNotNull(clazz);
superInheritances = clazz.getSuperInheritances();
assertEquals(1, superInheritances.size());
inh = (Inheritance) firstElt(superInheritances);
assertSame(clazz, inh.getSubclass());
- assertSame(detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class,
+ assertSame(detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class,
JavaDictionary.OBJECT_NAME), inh.getSuperclass());
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "XPrinter");
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "XPrinter");
assertNotNull(clazz);
inherits = clazz.getSuperInheritances();
assertEquals(1, inherits.size()); // superInheritances: Object (in this order)
@@ -321,7 +321,7 @@ public void testInheritance() {
assertSame(clazz, inh.getSubclass());
assertNull(inh.getPrevious());
assertSame(inh, inh.getNext().getPrevious());
- assertSame(detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, JavaDictionary.OBJECT_NAME), inh.getSuperclass());
+ assertSame(detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, JavaDictionary.OBJECT_NAME), inh.getSuperclass());
assertSame(inh.getNext(), implem);
assertSame(implem.getPrevious(), inh);
@@ -341,7 +341,7 @@ public void testMethodProperties() {
assertNotNull(mweb);
assertEquals("methodWithEmptyBody", mweb.getName());
assertEquals("methodWithEmptyBody()", mweb.getSignature());
- assertSame(detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Node"),
+ assertSame(detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "Node"),
mweb.getParentType());
assertSame(detectFamixElement(PrimitiveType.class, "void"), mweb.getDeclaredType());
@@ -349,12 +349,12 @@ public void testMethodProperties() {
assertNotNull(em);
assertEquals("equalsMultiple", em.getName());
assertEquals("equalsMultiple(AbstractDestinationAddress)", em.getSignature());
- assertSame(detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class,
+ assertSame(detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class,
"SingleDestinationAddress"), em.getParentType());
assertSame(detectFamixElement(PrimitiveType.class, "boolean"), em.getDeclaredType());
- org.moosetechnology.model.famixjava.famixjavaentities.Class clazz = detectFamixElement(
- org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "FileServer");
+ org.moosetechnology.model.famix.famixjavaentities.Class clazz = detectFamixElement(
+ org.moosetechnology.model.famix.famixjavaentities.Class.class, "FileServer");
assertNotNull(clazz);
Method n = null;
for (TMethod tm : clazz.getMethods()) {
@@ -367,9 +367,9 @@ public void testMethodProperties() {
assertNotNull(n);
assertEquals("name", n.getName());
assertEquals("name()", n.getSignature());
- assertSame(detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "FileServer"),
+ assertSame(detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "FileServer"),
n.getParentType());
- assertSame(detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "String"),
+ assertSame(detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "String"),
n.getDeclaredType());
// constructors
@@ -387,8 +387,8 @@ public void testMethodProperties() {
@Test
public void testFieldType() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class clazz = detectFamixElement(
- org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Node");
+ org.moosetechnology.model.famix.famixjavaentities.Class clazz = detectFamixElement(
+ org.moosetechnology.model.famix.famixjavaentities.Class.class, "Node");
assertNotNull(clazz);
Collection l_atts = clazz.getAttributes();
assertEquals(2, l_atts.size());
@@ -400,7 +400,7 @@ public void testFieldType() {
} else if (a.getName().equals("name")) {
assertSame(clazz, a.getParentType());
assertSame(
- detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "String"),
+ detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "String"),
a.getDeclaredType());
} else {
fail("Unknown attribute: " + a.getName());
@@ -421,21 +421,21 @@ public void testStubs() {
assertTrue(pckgLang.getIsStub());
// stub "Object" exists and is inside "lang" package
- org.moosetechnology.model.famixjava.famixjavaentities.Class
+ org.moosetechnology.model.famix.famixjavaentities.Class
clazz = detectFamixElement(
- org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Object");
+ org.moosetechnology.model.famix.famixjavaentities.Class.class, "Object");
assertNotNull(clazz);
assertTrue(clazz.getIsStub());
assertSame(pckgLang, clazz.getTypeContainer());
// stub "String" exists and is inside "lang" package
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "String");
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "String");
assertNotNull(clazz);
assertTrue(clazz.getIsStub());
assertSame(pckgLang, clazz.getTypeContainer());
// "Node" is not stub
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Node");
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "Node");
assertNotNull(clazz);
assertFalse(clazz.getIsStub());
@@ -447,8 +447,8 @@ public void testStubs() {
@Test
public void testParameter() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class nodeClass = detectFamixElement(
- org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Node");
+ org.moosetechnology.model.famix.famixjavaentities.Class nodeClass = detectFamixElement(
+ org.moosetechnology.model.famix.famixjavaentities.Class.class, "Node");
assertNotNull(nodeClass);
Collection methods = nodeClass.getMethods();
assertFalse("No methods in Node class !", methods.isEmpty());
@@ -483,7 +483,7 @@ public void testParameter() {
assertTrue(p.getName().equals("contents") || p.getName().equals("rv"));
if (p.getName().equals("contents")) {
assertSame(
- detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "String"),
+ detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "String"),
p.getDeclaredType());
} else if (p.getName().equals("rv")) {
assertSame(detectFamixElement(PrimitiveType.class, "boolean"), p.getDeclaredType());
@@ -496,8 +496,8 @@ public void testParameter() {
@Test
public void testImplicitVar() {
boolean testRan = false;
- org.moosetechnology.model.famixjava.famixjavaentities.Class clazz = detectFamixElement(
- org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "SingleDestinationAddress");
+ org.moosetechnology.model.famix.famixjavaentities.Class clazz = detectFamixElement(
+ org.moosetechnology.model.famix.famixjavaentities.Class.class, "SingleDestinationAddress");
assertNotNull(clazz);
Collection methods = clazz.getMethods();
for (TMethod tm : methods) {
@@ -517,7 +517,7 @@ public void testImplicitVar() {
assertTrue("Method SingleDestinationAddress.isDestinationFor() not found", testRan);
testRan = false;
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "WorkStation");
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "WorkStation");
assertNotNull(clazz);
methods = clazz.getMethods();
for (TMethod tm : methods) {
@@ -539,8 +539,8 @@ public void testImplicitVar() {
@Test
public void testInvocation() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class nodeClass = detectFamixElement(
- org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Node");
+ org.moosetechnology.model.famix.famixjavaentities.Class nodeClass = detectFamixElement(
+ org.moosetechnology.model.famix.famixjavaentities.Class.class, "Node");
assertNotNull(nodeClass);
Collection methods = nodeClass.getMethods();
assertFalse("No method found in Node !", methods.isEmpty());
@@ -595,8 +595,8 @@ public void testInvocation() {
}
assertTrue("No interesting invocation found", testRan);
- org.moosetechnology.model.famixjava.famixjavaentities.Class sdaClass = detectFamixElement(
- org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "SingleDestinationAddress");
+ org.moosetechnology.model.famix.famixjavaentities.Class sdaClass = detectFamixElement(
+ org.moosetechnology.model.famix.famixjavaentities.Class.class, "SingleDestinationAddress");
assertNotNull(sdaClass);
methods = sdaClass.getMethods();
assertFalse("No method found in SingleDestinationAddress !", methods.isEmpty());
@@ -621,7 +621,7 @@ public void testInvocation() {
assertSame(detectFamixElement(Method.class, "equalsSingle"), inv.getSender());
assertNull(inv.getReceiver());
assertSame(
- detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class,
+ detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class,
"String"),
((Method) firstElt(inv.getCandidates())).getParentType());
} else {
@@ -729,8 +729,8 @@ public void testAccess() {
public void testSourceAnchors() {
SourceAnchor anc = null;
- org.moosetechnology.model.famixjava.famixjavaentities.Class clazz = detectFamixElement(
- org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "XPrinter");
+ org.moosetechnology.model.famix.famixjavaentities.Class clazz = detectFamixElement(
+ org.moosetechnology.model.famix.famixjavaentities.Class.class, "XPrinter");
assertNotNull(clazz);
anc = (SourceAnchor) clazz.getSourceAnchor();
@@ -746,7 +746,7 @@ public void testSourceAnchors() {
assertEquals(528, ((IndexedFileAnchor) anc).getEndPos());
}
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Node");
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "Node");
assertNotNull(clazz);
anc = (SourceAnchor) clazz.getSourceAnchor();
@@ -801,8 +801,8 @@ public void testSourceAnchors() {
@Test
public void testModifiers() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class clazz = detectFamixElement(
- org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "OutputServer");
+ org.moosetechnology.model.famix.famixjavaentities.Class clazz = detectFamixElement(
+ org.moosetechnology.model.famix.famixjavaentities.Class.class, "OutputServer");
assertNotNull(clazz);
assertFalse(clazz.getIsInterface());
assertTrue(clazz.getIsAbstract());
@@ -840,8 +840,8 @@ public void testModifiers() {
@Test
public void testComment() {
// testing javadoc
- org.moosetechnology.model.famixjava.famixjavaentities.Class clazz = detectFamixElement(
- org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "SingleDestinationAddress");
+ org.moosetechnology.model.famix.famixjavaentities.Class clazz = detectFamixElement(
+ org.moosetechnology.model.famix.famixjavaentities.Class.class, "SingleDestinationAddress");
assertNotNull(clazz);
Collection cmts = clazz.getComments();
assertEquals(2, cmts.size()); // file javaDoc + class javaDoc
@@ -875,7 +875,7 @@ public void testComment() {
}
// testing the non javadoc comments (those that are treated)
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "WorkStation");
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "WorkStation");
assertNotNull(clazz);
Attribute a = (Attribute) firstElt(clazz.getAttributes());
assertEquals("type", a.getName());
@@ -895,7 +895,7 @@ public void testMetric() {
assertEquals(3, lMeths.size());
for (Method m : lMeths) {
assertNotNull(m);
- org.moosetechnology.model.famixjava.famixjavaentities.Class owner = (org.moosetechnology.model.famixjava.famixjavaentities.Class) m
+ org.moosetechnology.model.famix.famixjavaentities.Class owner = (org.moosetechnology.model.famix.famixjavaentities.Class) m
.getParentType();
assertNotNull(owner);
if (owner.getName().equals("OutputServer")) {
@@ -915,15 +915,15 @@ public void testMetric() {
@Test
public void testAnnotation() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class clazz;
+ org.moosetechnology.model.famix.famixjavaentities.Class clazz;
Collection annInstances;
AnnotationType annType = detectFamixElement(
- org.moosetechnology.model.famixjava.famixjavaentities.AnnotationType.class, "Override");
+ org.moosetechnology.model.famix.famixjavaentities.AnnotationType.class, "Override");
assertNotNull(annType);
assertEquals("Override", annType.getName());
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "PrintServer");
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "PrintServer");
assertNotNull(clazz);
Collection methods = clazz.getMethods();
assertFalse("No method found in PrintServer", methods.isEmpty());
@@ -940,7 +940,7 @@ public void testAnnotation() {
assertEquals(0, annInstances.size());
}
}
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class,
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class,
"SingleDestinationAddress");
assertNotNull(clazz);
methods = clazz.getMethods();
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_ReferenceInstanceOf.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_ReferenceInstanceOf.java
index 561f221c..4cd3e5c0 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_ReferenceInstanceOf.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_ReferenceInstanceOf.java
@@ -2,7 +2,7 @@
import org.junit.Before;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.Class;
+import org.moosetechnology.model.famix.famixjavaentities.Class;
import java.io.File;
@@ -42,7 +42,7 @@ public void testReferenceToString() {
@Test
public void testExistingException() {
parse(new String[]{"-alllocals", "-anchor", "assoc", "test_src/instanceOf"});
- org.moosetechnology.model.famixjava.famixjavaentities.Exception exception = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Exception.class , "SeditException");
+ org.moosetechnology.model.famix.famixjavaentities.Exception exception = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Exception.class , "SeditException");
// From Calculated Expression "hello" and from TypeLiteral String.class
assertNotNull(exception);
}
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Ser.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Ser.java
index 54f99f11..c9a63a1b 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Ser.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Ser.java
@@ -2,12 +2,10 @@
import org.junit.Before;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.Method;
-import org.moosetechnology.model.famixjava.famixtraits.TMethod;
-import org.moosetechnology.model.famixjava.famixtraits.TNamedEntity;
+import org.moosetechnology.model.famix.famixjavaentities.Method;
+import org.moosetechnology.model.famix.famixtraits.TMethod;
import java.io.File;
-import java.util.Collection;
import static org.junit.Assert.*;
@@ -31,7 +29,7 @@ public void setUp() throws Exception {
@Test
public void testDeclaredExceptions() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class myServiceImplClass = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "MyServiceImpl");
+ org.moosetechnology.model.famix.famixjavaentities.Class myServiceImplClass = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "MyServiceImpl");
assertNotNull(myServiceImplClass);
assertEquals(11, myServiceImplClass.getMethods().size());
diff --git a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Summarized.java b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Summarized.java
index 96ca7725..c8e27275 100644
--- a/tests/fr/inria/verveine/extractor/java/VerveineJTest_Summarized.java
+++ b/tests/fr/inria/verveine/extractor/java/VerveineJTest_Summarized.java
@@ -73,26 +73,26 @@
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.Access;
-import org.moosetechnology.model.famixjava.famixjavaentities.AnnotationInstance;
-import org.moosetechnology.model.famixjava.famixjavaentities.AnnotationType;
-import org.moosetechnology.model.famixjava.famixjavaentities.Attribute;
-import org.moosetechnology.model.famixjava.famixjavaentities.Comment;
-import org.moosetechnology.model.famixjava.famixjavaentities.Implementation;
-import org.moosetechnology.model.famixjava.famixjavaentities.IndexedFileAnchor;
-import org.moosetechnology.model.famixjava.famixjavaentities.Inheritance;
-import org.moosetechnology.model.famixjava.famixjavaentities.Interface;
-import org.moosetechnology.model.famixjava.famixjavaentities.Invocation;
-import org.moosetechnology.model.famixjava.famixjavaentities.LocalVariable;
-import org.moosetechnology.model.famixjava.famixjavaentities.Method;
-import org.moosetechnology.model.famixjava.famixjavaentities.Package;
-import org.moosetechnology.model.famixjava.famixjavaentities.Parameter;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterizableClass;
-import org.moosetechnology.model.famixjava.famixjavaentities.ParameterizableInterface;
-import org.moosetechnology.model.famixjava.famixjavaentities.PrimitiveType;
-import org.moosetechnology.model.famixjava.famixjavaentities.Reference;
-import org.moosetechnology.model.famixjava.famixtraits.TImplementation;
-import org.moosetechnology.model.famixjava.famixtraits.TInheritance;
+import org.moosetechnology.model.famix.famixjavaentities.Access;
+import org.moosetechnology.model.famix.famixjavaentities.AnnotationInstance;
+import org.moosetechnology.model.famix.famixjavaentities.AnnotationType;
+import org.moosetechnology.model.famix.famixjavaentities.Attribute;
+import org.moosetechnology.model.famix.famixjavaentities.Comment;
+import org.moosetechnology.model.famix.famixjavaentities.Implementation;
+import org.moosetechnology.model.famix.famixjavaentities.IndexedFileAnchor;
+import org.moosetechnology.model.famix.famixjavaentities.Inheritance;
+import org.moosetechnology.model.famix.famixjavaentities.Interface;
+import org.moosetechnology.model.famix.famixjavaentities.Invocation;
+import org.moosetechnology.model.famix.famixjavaentities.LocalVariable;
+import org.moosetechnology.model.famix.famixjavaentities.Method;
+import org.moosetechnology.model.famix.famixjavaentities.Package;
+import org.moosetechnology.model.famix.famixjavaentities.Parameter;
+import org.moosetechnology.model.famix.famixjavaentities.ParameterizableClass;
+import org.moosetechnology.model.famix.famixjavaentities.ParameterizableInterface;
+import org.moosetechnology.model.famix.famixjavaentities.PrimitiveType;
+import org.moosetechnology.model.famix.famixjavaentities.Reference;
+import org.moosetechnology.model.famix.famixtraits.TImplementation;
+import org.moosetechnology.model.famix.famixtraits.TInheritance;
/**
* @author Nicolas Anquetil
@@ -159,7 +159,7 @@ private void parseFile(String file) {
public void testEntitiesNumber() {
assertEquals(
allJavaSuperClasses(LAN_MODEL_JAVA_CLASSES_USED).size() + 10, // FileServer, Node, AbstractDestinationAddress, WorkStation, XPrinter, Packet, PrintServer, SingleDestinationAddress, OutputServer, _Anonymous(IPrinter)
- entitiesOfType(org.moosetechnology.model.famixjava.famixjavaentities.Class.class).size());
+ entitiesOfType(org.moosetechnology.model.famix.famixjavaentities.Class.class).size());
assertEquals(
allInterfacesFromClasses(LAN_MODEL_JAVA_CLASSES_USED).size() + 1, // add IPrinter
@@ -210,7 +210,7 @@ public void testReferences() {
@Test
public void testInheritance() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class clazz;
+ org.moosetechnology.model.famix.famixjavaentities.Class clazz;
Collection inherits;
Collection implementations;
Inheritance inh = null;
@@ -220,23 +220,23 @@ public void testInheritance() {
nbInherit += lanModelInterfacesSubtyped().size(); // Subtyping between interfaces is considered inheritance
assertEquals(nbInherit, entitiesOfType(Inheritance.class).size()); // one less than in VerveineJTest_LanModel because anonymous class is not created
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "PrintServer");
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "PrintServer");
assertNotNull(clazz);
inherits = clazz.getSuperInheritances();
assertEquals(1, inherits.size());
inh = (Inheritance) firstElt(inherits);
assertSame(clazz, inh.getSubclass());
- assertSame(detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "OutputServer"), inh.getSuperclass());
+ assertSame(detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "OutputServer"), inh.getSuperclass());
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Node");
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "Node");
assertNotNull(clazz);
inherits = clazz.getSuperInheritances();
assertEquals(1, inherits.size());
inh = (Inheritance) firstElt(inherits);
assertSame(clazz, inh.getSubclass());
- assertSame(detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, JavaDictionary.OBJECT_NAME), inh.getSuperclass());
+ assertSame(detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, JavaDictionary.OBJECT_NAME), inh.getSuperclass());
- clazz = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "XPrinter");
+ clazz = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "XPrinter");
assertNotNull(clazz);
inherits = clazz.getSuperInheritances();
assertEquals(1, inherits.size()); // superInheritances: Object (in this order)
@@ -256,7 +256,7 @@ public void testInheritance() {
assertSame(clazz, inh.getSubclass());
assertNull(inh.getPrevious());
assertSame(inh, inh.getNext().getPrevious());
- assertSame(detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, JavaDictionary.OBJECT_NAME), inh.getSuperclass());
+ assertSame(detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, JavaDictionary.OBJECT_NAME), inh.getSuperclass());
assertSame(inh.getNext(), implem);
assertSame(implem.getPrevious(), inh);
diff --git a/tests/fr/inria/verveine/extractor/java/verveineJTest_Annotations.java b/tests/fr/inria/verveine/extractor/java/verveineJTest_Annotations.java
index c4a12a47..8f00ef55 100644
--- a/tests/fr/inria/verveine/extractor/java/verveineJTest_Annotations.java
+++ b/tests/fr/inria/verveine/extractor/java/verveineJTest_Annotations.java
@@ -2,8 +2,8 @@
import org.junit.Before;
import org.junit.Test;
-import org.moosetechnology.model.famixjava.famixjavaentities.*;
-import org.moosetechnology.model.famixjava.famixtraits.*;
+import org.moosetechnology.model.famix.famixjavaentities.*;
+import org.moosetechnology.model.famix.famixtraits.*;
import java.io.File;
import java.lang.Exception;
@@ -35,7 +35,7 @@ public void setUp() throws Exception {
@Test
public void testAnnotationSubClass() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class cl = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "SubAnnotation");
+ org.moosetechnology.model.famix.famixjavaentities.Class cl = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "SubAnnotation");
assertNotNull(cl);
AnnotationType getProp = detectFamixElement(AnnotationType.class, "GetProperty");
@@ -44,7 +44,7 @@ public void testAnnotationSubClass() {
@Test
public void testClassAnnotation() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class cl = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Serializer");
+ org.moosetechnology.model.famix.famixjavaentities.Class cl = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "Serializer");
assertEquals(1, cl.getAnnotationInstances().size());
AnnotationInstance sw = (AnnotationInstance) firstElt(cl.getAnnotationInstances());
assertNotNull(sw);
@@ -60,7 +60,7 @@ public void testClassAnnotation() {
@Test
public void testMethodAnnotation() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class book = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Book");
+ org.moosetechnology.model.famix.famixjavaentities.Class book = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "Book");
Collection bookMethods = book.getMethods();
AnnotationType getProp = detectFamixElement(AnnotationType.class, "GetProperty");
assertNotNull(getProp);
@@ -92,7 +92,7 @@ else if (((TNamedEntity)meth).getName().startsWith("set")) {
@Test
public void testAttributeAnnotation() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class book = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "Book");
+ org.moosetechnology.model.famix.famixjavaentities.Class book = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "Book");
Collection bookAttributes = book.getAttributes();
assertEquals(6, bookAttributes.size());
for (TAttribute att : bookAttributes) {
@@ -233,7 +233,7 @@ public void testAnnotationType() {
@Test
public void testAnnotationInstanceAttribute() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class clss = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "AnnotatedClass");
+ org.moosetechnology.model.famix.famixjavaentities.Class clss = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "AnnotatedClass");
assertNotNull(clss);
assertEquals(1, clss.numberOfAnnotationInstances());
@@ -251,7 +251,7 @@ public void testAnnotationInstanceAttribute() {
@Test
public void testAnnotationInstanceArrayOfOne() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class clss = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "AThirdAnnotatedClass");
+ org.moosetechnology.model.famix.famixjavaentities.Class clss = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "AThirdAnnotatedClass");
assertNotNull(clss);
assertEquals(1, clss.numberOfAnnotationInstances());
@@ -270,7 +270,7 @@ public void testAnnotationInstanceArrayOfOne() {
@Test
public void testAnnotationInstanceEmptyArrayForValue() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class clss = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "AnotherInterceptorClass");
+ org.moosetechnology.model.famix.famixjavaentities.Class clss = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "AnotherInterceptorClass");
assertNotNull(clss);
assertEquals(1, clss.numberOfAnnotationInstances());
@@ -285,7 +285,7 @@ public void testAnnotationInstanceEmptyArrayForValue() {
@Test
public void testAnnotationInstanceArray() {
- org.moosetechnology.model.famixjava.famixjavaentities.Class clss = detectFamixElement(org.moosetechnology.model.famixjava.famixjavaentities.Class.class, "AnotherAnnotatedClass");
+ org.moosetechnology.model.famix.famixjavaentities.Class clss = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Class.class, "AnotherAnnotatedClass");
assertNotNull(clss);
assertEquals(1, clss.numberOfAnnotationInstances());